updated 祖太公,祖太婆称谓完善

dist/relationship.js

@@ -174,14 +174,14 @@
 		'f':['爸爸','父亲','阿爸','老爸','老窦','爹','爹爹','爹地','爹啲','老爹','大大','老爷子'],
 		'f,f':['爷爷','祖父','阿爷','奶爷','阿公'],
 		'f,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':['高祖母','老太太','祖太太','祖太奶','祖太奶奶','祖太婆'],
 		'f,f,f,m,xs':['姨高祖母'],
 		'f,f,f,m,xs,h':['姨高祖父'],
 		'f,f,f,ob':['曾伯祖父','曾伯父','伯曾祖父','伯公太','伯太爷'],
@@ -209,8 +209,8 @@
 		'f,f,f,xs,d':['表姑祖母'],
 		'f,f,f,xs,d,h':['表姑祖父'],
 		'f,f,m':['曾祖母','太奶奶','太婆','祖婆','祖奶奶'],
-		'f,f,m,f':['高外祖父','祖太姥爷'],
+		'f,f,m,f':['高外祖父','祖太姥爷','祖太公'],
-		'f,f,m,m':['高外祖母','祖太姥姥'],
+		'f,f,m,m':['高外祖母','祖太姥姥','祖太姥娘','祖太婆'],
 		'f,f,m,xb':['舅曾祖父','太舅公','太舅爷','舅太爷','舅太爷爷'],
 		'f,f,m,xb,w':['舅曾祖母','太舅婆','舅太太','舅太奶奶'],
 		'f,f,m,xb,s&o':['表伯祖父'],
@@ -263,8 +263,8 @@
 		'f,f,xs,d,h':['姑表姑父','表姑爸','表姑父','表姑丈'],
 		'f,m':['奶奶','祖母','阿嫲','阿嬷','嫲嫲'],
 		'f,m,f':['曾外祖父','外太公','太姥爷'],
-		'f,m,f,f':['祖太爷爷'],
+		'f,m,f,f':['祖太爷','祖太爷爷','祖太公'],
-		'f,m,f,m':['祖太奶奶'],
+		'f,m,f,m':['祖太太','祖太奶奶','祖太婆'],
 		'f,m,f,xb,s':['堂舅祖父'],
 		'f,m,f,xb,s,w':['堂舅祖母'],
 		'f,m,f,xb,d':['堂姨祖母'],
@@ -278,8 +278,8 @@
 		'f,m,f,xs,s':['表舅祖父'],
 		'f,m,f,xs,s,w':['表舅祖母'],
 		'f,m,m':['曾外祖母','外太婆','太姥姥'],
-		'f,m,m,f':['祖太姥爷'],
+		'f,m,m,f':['祖太姥爷','祖太公'],
-		'f,m,m,m':['祖太姥姥'],
+		'f,m,m,m':['祖太姥姥','祖太姥娘','祖太婆'],
 		'f,m,m,xb':['舅曾外祖父','舅太姥爷','舅太奶爷'],
 		'f,m,m,xb,w':['舅曾外祖母','舅太姥姥','舅太奶奶'],
 		'f,m,m,xb,s':['表舅祖父'],
@@ -369,8 +369,8 @@
 		'm':['妈妈','母亲','老妈','阿妈','老母','老妈子','娘','娘亲','妈咪'],
 		'm,f':['外公','外祖父','姥爷'],
 		'm,f,f':['外曾祖父','外太祖父','外太公','外太爷爷','太外祖父'],
-		'm,f,f,f':['外高祖父','祖太爷爷'],
+		'm,f,f,f':['外高祖父','祖太爷','祖太爷爷','祖太公'],
-		'm,f,f,m':['外高祖母','祖太奶奶'],
+		'm,f,f,m':['外高祖母','祖太太','祖太奶奶','祖太婆'],
 		'm,f,f,xb,s&o':['堂伯外祖父'],
 		'm,f,f,xb,s&o,w':['堂伯外祖母'],
 		'm,f,f,xb,s&l':['堂叔外祖父'],
@@ -390,8 +390,8 @@
 		'm,f,f,xs,d':['表姑外祖母'],
 		'm,f,f,xs,d,h':['表姑外祖父'],
 		'm,f,m':['外曾祖母','外太祖母','太外祖母','外太奶奶','外太婆'],
-		'm,f,m,f':['外高外祖父','祖太姥爷'],
+		'm,f,m,f':['外高外祖父','祖太姥爷','祖太公'],
-		'm,f,m,m':['外高外祖母','祖太姥姥'],
+		'm,f,m,m':['外高外祖母','祖太姥姥','祖太姥娘','祖太婆'],
 		'm,f,m,xb':['舅外曾祖父','外太舅公','舅太姥爷','舅太奶爷'],
 		'm,f,m,xb,w':['舅外曾祖母','外太舅母','舅太姥姥','舅太奶奶','外太舅婆'],
 		'm,f,m,xb,d':['表姑外祖母'],
@@ -421,8 +421,8 @@
 		'm,f,xs,d,d':['从表姐妹'],
 		'm,m':['外婆','外祖母','姥姥','阿婆'],
 		'm,m,f':['外曾外祖父','外太外公','外太姥爷'],
-		'm,m,f,f':['祖太爷爷'],
+		'm,m,f,f':['祖太爷','祖太爷爷','祖太公'],
-		'm,m,f,m':['祖太奶奶'],
+		'm,m,f,m':['祖太太','祖太奶奶','祖太婆'],
 		'm,m,f,xb,s':['堂舅外祖父'],
 		'm,m,f,xb,s,w':['堂舅外祖母'],
 		'm,m,f,xb,d':['堂姨外祖母'],
@@ -438,8 +438,8 @@
 		'm,m,f,xs,d':['表姨外祖母'],
 		'm,m,f,xs,d,h':['表姨外祖父'],
 		'm,m,m':['外曾外祖母','外太外婆','外太姥姥'],
-		'm,m,m,f':['祖太姥爷'],
+		'm,m,m,f':['祖太姥爷','祖太公'],
-		'm,m,m,m':['祖太姥姥'],
+		'm,m,m,m':['祖太姥姥','祖太姥娘','祖太婆'],
 		'm,m,m,xb':['舅外曾外祖父','舅太姥爷'],
 		'm,m,m,xb,w':['舅外曾外祖母','舅太姥姥'],
 		'm,m,m,xb,s':['表舅外祖父'],

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:""}],w={"":["自己","我"],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,s,s&o":["族兄"],"f,f,f,xb,s,s,s&l":["族弟"],"f,f,f,xb,d":["堂姑祖母"],"f,f,f,xb,d,h":["堂姑祖父"],"f,f,f,xs":["曾祖姑母","姑曾祖母","太姑婆","姑婆太","姑Line 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 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:""}],w={"":["自己","我"],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,s,s&o":["族兄"],"f,f,f,xb,s,s,s&l":["族弟"],"f,f,f,xb,d":["堂姑祖母"],"f,f,f,xb,d,h":["堂姑祖父"],"f,f,f,xs":["曾祖姑母","姑曾祖母","太Line truncated

script/relationship.js

@@ -174,14 +174,14 @@
 		'f':['爸爸','父亲','阿爸','老爸','老窦','爹','爹爹','爹地','爹啲','老爹','大大','老爷子'],
 		'f,f':['爷爷','祖父','阿爷','奶爷','阿公'],
 		'f,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':['高祖母','老太太','祖太太','祖太奶','祖太奶奶','祖太婆'],
 		'f,f,f,m,xs':['姨高祖母'],
 		'f,f,f,m,xs,h':['姨高祖父'],
 		'f,f,f,ob':['曾伯祖父','曾伯父','伯曾祖父','伯公太','伯太爷'],
@@ -209,8 +209,8 @@
 		'f,f,f,xs,d':['表姑祖母'],
 		'f,f,f,xs,d,h':['表姑祖父'],
 		'f,f,m':['曾祖母','太奶奶','太婆','祖婆','祖奶奶'],
-		'f,f,m,f':['高外祖父','祖太姥爷'],
+		'f,f,m,f':['高外祖父','祖太姥爷','祖太公'],
-		'f,f,m,m':['高外祖母','祖太姥姥'],
+		'f,f,m,m':['高外祖母','祖太姥姥','祖太姥娘','祖太婆'],
 		'f,f,m,xb':['舅曾祖父','太舅公','太舅爷','舅太爷','舅太爷爷'],
 		'f,f,m,xb,w':['舅曾祖母','太舅婆','舅太太','舅太奶奶'],
 		'f,f,m,xb,s&o':['表伯祖父'],
@@ -263,8 +263,8 @@
 		'f,f,xs,d,h':['姑表姑父','表姑爸','表姑父','表姑丈'],
 		'f,m':['奶奶','祖母','阿嫲','阿嬷','嫲嫲'],
 		'f,m,f':['曾外祖父','外太公','太姥爷'],
-		'f,m,f,f':['祖太爷爷'],
+		'f,m,f,f':['祖太爷','祖太爷爷','祖太公'],
-		'f,m,f,m':['祖太奶奶'],
+		'f,m,f,m':['祖太太','祖太奶奶','祖太婆'],
 		'f,m,f,xb,s':['堂舅祖父'],
 		'f,m,f,xb,s,w':['堂舅祖母'],
 		'f,m,f,xb,d':['堂姨祖母'],
@@ -278,8 +278,8 @@
 		'f,m,f,xs,s':['表舅祖父'],
 		'f,m,f,xs,s,w':['表舅祖母'],
 		'f,m,m':['曾外祖母','外太婆','太姥姥'],
-		'f,m,m,f':['祖太姥爷'],
+		'f,m,m,f':['祖太姥爷','祖太公'],
-		'f,m,m,m':['祖太姥姥'],
+		'f,m,m,m':['祖太姥姥','祖太姥娘','祖太婆'],
 		'f,m,m,xb':['舅曾外祖父','舅太姥爷','舅太奶爷'],
 		'f,m,m,xb,w':['舅曾外祖母','舅太姥姥','舅太奶奶'],
 		'f,m,m,xb,s':['表舅祖父'],
@@ -369,8 +369,8 @@
 		'm':['妈妈','母亲','老妈','阿妈','老母','老妈子','娘','娘亲','妈咪'],
 		'm,f':['外公','外祖父','姥爷'],
 		'm,f,f':['外曾祖父','外太祖父','外太公','外太爷爷','太外祖父'],
-		'm,f,f,f':['外高祖父','祖太爷爷'],
+		'm,f,f,f':['外高祖父','祖太爷','祖太爷爷','祖太公'],
-		'm,f,f,m':['外高祖母','祖太奶奶'],
+		'm,f,f,m':['外高祖母','祖太太','祖太奶奶','祖太婆'],
 		'm,f,f,xb,s&o':['堂伯外祖父'],
 		'm,f,f,xb,s&o,w':['堂伯外祖母'],
 		'm,f,f,xb,s&l':['堂叔外祖父'],
@@ -390,8 +390,8 @@
 		'm,f,f,xs,d':['表姑外祖母'],
 		'm,f,f,xs,d,h':['表姑外祖父'],
 		'm,f,m':['外曾祖母','外太祖母','太外祖母','外太奶奶','外太婆'],
-		'm,f,m,f':['外高外祖父','祖太姥爷'],
+		'm,f,m,f':['外高外祖父','祖太姥爷','祖太公'],
-		'm,f,m,m':['外高外祖母','祖太姥姥'],
+		'm,f,m,m':['外高外祖母','祖太姥姥','祖太姥娘','祖太婆'],
 		'm,f,m,xb':['舅外曾祖父','外太舅公','舅太姥爷','舅太奶爷'],
 		'm,f,m,xb,w':['舅外曾祖母','外太舅母','舅太姥姥','舅太奶奶','外太舅婆'],
 		'm,f,m,xb,d':['表姑外祖母'],
@@ -421,8 +421,8 @@
 		'm,f,xs,d,d':['从表姐妹'],
 		'm,m':['外婆','外祖母','姥姥','阿婆'],
 		'm,m,f':['外曾外祖父','外太外公','外太姥爷'],
-		'm,m,f,f':['祖太爷爷'],
+		'm,m,f,f':['祖太爷','祖太爷爷','祖太公'],
-		'm,m,f,m':['祖太奶奶'],
+		'm,m,f,m':['祖太太','祖太奶奶','祖太婆'],
 		'm,m,f,xb,s':['堂舅外祖父'],
 		'm,m,f,xb,s,w':['堂舅外祖母'],
 		'm,m,f,xb,d':['堂姨外祖母'],
@@ -438,8 +438,8 @@
 		'm,m,f,xs,d':['表姨外祖母'],
 		'm,m,f,xs,d,h':['表姨外祖父'],
 		'm,m,m':['外曾外祖母','外太外婆','外太姥姥'],
-		'm,m,m,f':['祖太姥爷'],
+		'm,m,m,f':['祖太姥爷','祖太公'],
-		'm,m,m,m':['祖太姥姥'],
+		'm,m,m,m':['祖太姥姥','祖太姥娘','祖太婆'],
 		'm,m,m,xb':['舅外曾外祖父','舅太姥爷'],
 		'm,m,m,xb,w':['舅外曾外祖母','舅太姥姥'],
 		'm,m,m,xb,s':['表舅外祖父'],