Merge branch 'master' of github.com:mumuy/relationship

dist/relationship.js

@@ -166,11 +166,11 @@
 			str:''
 		},
 		{//并列关系处理1
-			exp:/(.+)?\[([^\|]+)\|(.+\|.+)?\](.+)?/g,
+			exp:/(.+)?\[([^\|]+?)\|([^\[\]]+?\|[^\[\]]+?)?\](.+)?/g,
 			str:'$1$2$4#$1[$3]$4'
 		},
 		{//并列关系处理2
-			exp:/(.+)?\[([^\[\]]+)\|([^\[\]]+)?\](.+)?/g,
+			exp:/(.+)?\[([^\[\]\|]+?)\|([^\[\]\|]+?)?\](.+)?/g,
 			str:'$1$2$4#$1$3$4'
 		}
 	];
@@ -187,24 +187,78 @@
 		'[h,f|h,m]':['公婆'],
 		'[w,f|w,m]':['岳父母'],
 		'[xb|xs]':['兄弟姐妹','同胞','手足'],
-		'[s|d]':['子女','儿女','小孩','孩子'],
+		'[f,xb,s&o|f,xb,s&l]':['堂兄弟'],
+		'[f,xb,d&o|f,xb,d&l]':['堂姐妹','堂姊妹'],
+		'[f,xs,s&o|f,xs,s&l|m,xb,s&o|m,xb,s&l]':['表兄弟'],
+		'[f,xs,d&o|f,xs,d&l|m,xb,d&o|m,xb,d&l]':['表姐妹','表姊妹'],
+		'[s|d]':['子女','儿女','小孩','孩子','孩儿'],
 		'[s,s|s,d|d,s|d,d]':['孙辈'],
 		// 本家
 		'f':['爸爸','父亲','阿爸','老爸','老窦','爸','父','爹','爹爹','爹地','爹啲','老爹','大大','老爷子'],
 		// 爷爷
 		'f,f':['爷爷','祖父','阿爷','奶爷','阿公','老爷'],
-		'f,f,f':['曾祖父','太爷','太爷爷','太公','祖公','祖奶爷','太老爷'],
+		'f,f,f':['曾祖父','曾祖','太爷','太爷爷','太公','祖公','祖奶爷','太老爷'],
 		'f,f,f,f':['高祖父','老太奶爷','老太爷','祖太爷','祖太爷爷','祖太公','高王父'],
-		'f,f,f,f,f':['天祖父'],
+		'f,f,f,f,f':['天祖父','高祖'],
-		'f,f,f,f,f,f':['烈祖父'],
+		'f,f,f,f,f,f':['烈祖父','烈祖'],
-		'f,f,f,f,f,m':['烈祖母'],
+		'f,f,f,f,f,f,f':['太祖父','太祖'],
-		'f,f,f,f,f,f,f':['太祖父'],
+		'f,f,f,f,f,f,f,f':['远祖父','远祖'],
-		'f,f,f,f,f,f,m':['太祖母'],
+		'f,f,f,f,f,f,f,f,f':['鼻祖父','鼻祖','始祖'],
-		'f,f,f,f,f,f,f,f':['远祖父'],
+		'f,f,f,f,f,f,f,f,f,ob':['伯鼻祖父'],
-		'f,f,f,f,f,f,f,m':['远祖母'],
+		'f,f,f,f,f,f,f,f,f,ob,w':['伯鼻祖母'],
-		'f,f,f,f,f,f,f,f,f':['鼻祖父'],
+		'f,f,f,f,f,f,f,f,f,lb':['叔鼻祖父'],
+		'f,f,f,f,f,f,f,f,f,lb,w':['叔鼻祖母'],
+		'f,f,f,f,f,f,f,f,f,xs':['姑鼻祖母'],
+		'f,f,f,f,f,f,f,f,f,xs,h':['姑鼻祖父'],
 		'f,f,f,f,f,f,f,f,m':['鼻祖母'],
+		'f,f,f,f,f,f,f,f,m,xs':['姨鼻祖母'],
+		'f,f,f,f,f,f,f,f,m,xs,h':['姨鼻祖父'],
+		'f,f,f,f,f,f,f,f,m,xb':['舅鼻祖父'],
+		'f,f,f,f,f,f,f,f,m,xb,w':['舅鼻祖母'],
+		'f,f,f,f,f,f,f,f,ob':['伯远祖父'],
+		'f,f,f,f,f,f,f,f,ob,w':['伯远祖母'],
+		'f,f,f,f,f,f,f,f,lb':['叔远祖父'],
+		'f,f,f,f,f,f,f,f,lb,w':['叔远祖母'],
+		'f,f,f,f,f,f,f,f,xs':['姑远祖母'],
+		'f,f,f,f,f,f,f,f,xs,h':['姑远祖父'],
+		'f,f,f,f,f,f,f,m':['远祖母'],
+		'f,f,f,f,f,f,f,m,xs':['姨远祖母'],
+		'f,f,f,f,f,f,f,m,xs,h':['姨远祖父'],
+		'f,f,f,f,f,f,f,m,xb':['舅远祖父'],
+		'f,f,f,f,f,f,f,m,xb,w':['舅远祖母'],
+		'f,f,f,f,f,f,f,ob':['伯太祖父'],
+		'f,f,f,f,f,f,f,ob,w':['伯太祖母'],
+		'f,f,f,f,f,f,f,lb':['叔太祖父'],
+		'f,f,f,f,f,f,f,lb,w':['叔太祖母'],
+		'f,f,f,f,f,f,f,xs':['姑太祖母'],
+		'f,f,f,f,f,f,f,xs,h':['姑太祖父'],
+		'f,f,f,f,f,f,m':['太祖母'],
+		'f,f,f,f,f,f,m,xs':['姨太祖母'],
+		'f,f,f,f,f,f,m,xs,h':['姨太祖父'],
+		'f,f,f,f,f,f,m,xb':['舅太祖父'],
+		'f,f,f,f,f,f,m,xb,w':['舅太祖母'],
+		'f,f,f,f,f,f,ob':['伯烈祖父'],
+		'f,f,f,f,f,f,ob,w':['伯烈祖母'],
+		'f,f,f,f,f,f,lb':['叔烈祖父'],
+		'f,f,f,f,f,f,lb,w':['叔烈祖母'],
+		'f,f,f,f,f,f,xs':['姑烈祖母'],
+		'f,f,f,f,f,f,xs,h':['姑烈祖父'],
+		'f,f,f,f,f,m':['烈祖母'],
+		'f,f,f,f,f,m,xs':['姨烈祖母'],
+		'f,f,f,f,f,m,xs,h':['姨烈祖父'],
+		'f,f,f,f,f,m,xb':['舅烈祖父'],
+		'f,f,f,f,f,m,xb,w':['舅烈祖母'],
+		'f,f,f,f,f,ob':['伯天祖父'],
+		'f,f,f,f,f,ob,w':['伯天祖母'],
+		'f,f,f,f,f,lb':['叔天祖父'],
+		'f,f,f,f,f,lb,w':['叔天祖母'],
+		'f,f,f,f,f,xs':['姑天祖母'],
+		'f,f,f,f,f,xs,h':['姑天祖父'],
 		'f,f,f,f,m':['天祖母'],
+		'f,f,f,f,m,xs':['姨天祖母'],
+		'f,f,f,f,m,xs,h':['姨天祖父'],
+		'f,f,f,f,m,xb':['舅天祖父'],
+		'f,f,f,f,m,xb,w':['舅天祖母'],
 		'f,f,f,f,ob':['伯高祖父'],
 		'f,f,f,f,ob,w':['伯高祖母'],
 		'f,f,f,f,lb':['叔高祖父'],
@@ -568,41 +622,53 @@
 		// 从父
 		'f,ob':['伯父','伯伯','阿伯','大伯','大爹','大爸','x伯'],
 		'f,ob,w':['伯母','伯妈','伯娘','大娘','大妈','x妈'],
-		'f,lb':['叔叔','叔父','阿叔','叔爸','叔爹','仲父','小爹','小爸','x叔','叔'],
+		'f,lb':['叔叔','叔父','阿叔','叔爸','叔爹','仲父','小爹','小爸','幺爸','x叔','叔'],
-		'f,lb,w':['婶婶','婶母','婶娘','婶爹','婶妈','婶子','家婶','叔母','阿婶','叔妈','叔娘','季母','小娘','小妈','x婶','婶'],
+		'f,lb,w':['婶婶','婶母','婶娘','婶爹','婶妈','婶子','家婶','叔母','阿婶','叔妈','叔娘','季母','小娘','小妈','幺婶','x婶','婶'],
-		'f,xb,w,f':['叔姻外祖父','姻伯公'],
+		'f,xb,w,f':['叔姻外祖父','叔眷毑父','眷爷爷'],
-		'f,xb,w,m':['叔姻外祖母','姻伯婆'],
+		'f,xb,w,m':['叔姻外祖母','叔眷毑母','眷姥姥'],
 		'f,xb,w,xb':['叔姻舅父','姻舅父'],
 		'f,xb,w,xb,w':['叔姻舅母','姻舅母'],
 		'f,xb,w,xs':['叔姻姨母','姻姨母'],
 		'f,xb,w,xs,h':['叔姻姨父','姻姨父'],
 		'f,xb,s&o':['堂哥','堂兄','堂阿哥','从父兄','叔伯兄','从兄'],
-		'f,xb,s&o,w':['堂嫂'],
+		'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':['堂侄','堂侄男','堂侄子','从父侄男','叔伯侄男'],
-		'f,xb,s,s,w':['堂侄妇','从父侄妇','叔伯侄父'],
+		'f,xb,s,s,w':['堂侄媳妇','堂侄妇','从父侄妇','叔伯侄父'],
 		'f,xb,s,s,s':['堂侄孙男'],
 		'f,xb,s,s,s,w':['堂侄孙妇'],
 		'f,xb,s,s,d':['堂侄孙女'],
 		'f,xb,s,s,d,h':['堂侄孙婿'],
 		'f,xb,s,d':['堂侄女','从父侄女','叔伯侄女','堂侄'],
-		'f,xb,s,d,h':['堂侄婿','从父侄婿','叔伯侄婿'],
+		'f,xb,s,d,h':['堂侄女婿','堂侄婿','从父侄婿','叔伯侄婿'],
+		'f,xb,s,d,s':['堂侄外孙男'],
+		'f,xb,s,d,s,w':['堂侄外孙妇'],
+		'f,xb,s,d,d':['堂侄外孙女'],
+		'f,xb,s,d,d,h':['堂侄外孙婿'],
 		'f,xb,d&o':['堂姐','堂姊','堂阿姐','从父姊','叔伯姊','从姊'],
-		'f,xb,d&o,h':['堂姐夫'],
+		'f,xb,d&o,h':['堂姐夫','从父姊夫','从父姊婿','叔伯姊夫'],
 		'f,xb,d&l':['堂妹','堂阿妹','从父妹','叔伯妹','从妹'],
-		'f,xb,d&l,h':['堂妹夫'],
+		'f,xb,d&l,h':['堂妹夫','从父妹夫','从父妹婿','叔伯妹夫'],
 		'f,xb,d,s':['堂甥男','堂甥'],
 		'f,xb,d,s,w':['堂甥妇'],
+		'f,xb,d,s,s':['堂甥孙男'],
+		'f,xb,d,s,s,w':['堂甥孙妇'],
+		'f,xb,d,s,d':['堂甥孙女'],
+		'f,xb,d,s,d,h':['堂甥孙婿'],
 		'f,xb,d,d':['堂甥女','堂甥'],
 		'f,xb,d,d,h':['堂甥婿'],
+		'f,xb,d,d,s':['堂甥外孙男'],
+		'f,xb,d,d,s,w':['堂甥外孙妇'],
+		'f,xb,d,d,d':['堂甥外孙女'],
+		'f,xb,d,d,d,h':['堂甥外孙婿'],
 		// 姑表
 		'f,os':['姑妈','姑母'],
 		'f,ls':['姑妈','姑姐'],
 		'f,xs':['姑妈','姑姑','姑娘','大姑妈','姑','x姑妈'],
 		'f,xs,h':['姑丈','姑父','姑爸','姑夫','x姑丈','x姑父'],
-		'f,xs,h,f':['姑姻伯公','姻伯公'],
+		'f,xs,h,f':['姑姻祖父','姻爷爷'],
-		'f,xs,h,m':['姑姻伯婆','姻伯婆'],
+		'f,xs,h,m':['姑姻祖母','姻奶奶'],
 		'f,xs,h,ob':['姑姻伯父','姻伯父','姻世伯'],
 		'f,xs,h,ob,w':['姑姻伯母','姻伯母'],
 		'f,xs,h,lb':['姑姻叔父','姻叔父'],
@@ -610,9 +676,9 @@
 		'f,xs,h,xs':['姑姻姑母','姻姑母'],
 		'f,xs,h,xs,h':['姑姻姑父','姻姑父'],
 		'f,xs,s&o':['姑表哥','姑表兄','表哥','表兄'],
-		'f,xs,s&o,w':['姑表嫂','表嫂'],
+		'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,w':['姑表侄妇','表侄妇'],
 		'f,xs,s,s,s':['姑表侄孙男','姑表侄孙','表侄孙'],
@@ -621,20 +687,26 @@
 		'f,xs,s,s,d,h':['姑表侄孙婿','表侄孙婿'],
 		'f,xs,s,d':['姑表侄女','表侄女','表侄'],
 		'f,xs,s,d,h':['姑表侄婿','表侄婿'],
-		'f,xs,s,d,s':['姑表侄孙'],
+		'f,xs,s,d,s':['姑表侄外孙男'],
-		'f,xs,s,d,s,w':['姑表侄孙妇'],
+		'f,xs,s,d,s,w':['姑表侄外孙妇'],
-		'f,xs,s,d,d':['姑表侄孙女'],
+		'f,xs,s,d,d':['姑表侄外孙女'],
-		'f,xs,s,d,d,h':['姑表侄孙婿'],
+		'f,xs,s,d,d,h':['姑表侄外孙婿'],
 		'f,xs,d&o':['姑表姐','姑表姊','表姐','表姊'],
-		'f,xs,d&o,h':['姑表姐夫','姑表姊夫','表姐夫','表姊夫','表姐丈','表姊丈'],
+		'f,xs,d&o,h':['姑表姐夫','姑表姊夫','姑表姊婿','表姐夫','表姊夫','表姐丈','表姊丈'],
 		'f,xs,d&l':['姑表妹','表妹'],
-		'f,xs,d&l,h':['姑表妹夫','表妹夫'],
+		'f,xs,d&l,h':['姑表妹夫','姑表妹婿','表妹夫'],
 		'f,xs,d,s':['姑表甥男','表甥男','表外甥'],
+		'f,xs,d,s,w':['姑表甥妇'],
 		'f,xs,d,s,s':['姑表甥孙男','表甥孙男'],
+		'f,xs,d,s,s,w':['姑表甥孙妇','表甥孙妇'],
 		'f,xs,d,s,d':['姑表甥孙女','表甥孙女'],
+		'f,xs,d,s,d,h':['姑表甥孙婿','表甥孙婿'],
 		'f,xs,d,d':['姑表甥女','表甥女','表外甥'],
+		'f,xs,d,d,h':['姑表甥婿'],
 		'f,xs,d,d,s':['姑表甥外孙男','表甥外孙男'],
+		'f,xs,d,d,s,w':['姑表甥外孙妇','表甥外孙妇'],
 		'f,xs,d,d,d':['姑表甥外孙女','表甥外孙女'],
+		'f,xs,d,d,d,h':['姑表甥外孙婿','表甥外孙婿'],
 		// 外家
 		'm':['妈妈','母亲','老妈','阿妈','老母','老妈子','妈','母','娘','娘亲','妈咪'],
 		// 外公
@@ -648,12 +720,12 @@
 		'm,f,f,lb':['叔外曾祖父','外太叔公','叔太姥爷','叔太奶爷','叔太爷爷'],
 		'm,f,f,lb,w':['叔外曾祖母','外太叔母','叔太姥姥','叔太奶奶'],
 		// 再从父
-		'm,f,f,xb,s':['从父外祖父','从父姥爷'],
+		'm,f,f,xb,s':['堂外祖父','从父外祖父','从父姥爷'],
-		'm,f,f,xb,s,w':['从父外祖母','从父姥姥'],
+		'm,f,f,xb,s,w':['堂外祖母','从父外祖母','从父姥姥'],
-		'm,f,f,xb,s&o':['从父伯外祖父','从父伯姥爷'],
+		'm,f,f,xb,s&o':['堂伯外祖父','从父伯外祖父','从父伯姥爷'],
-		'm,f,f,xb,s&o,w':['从父伯外祖母','从父伯姥姥'],
+		'm,f,f,xb,s&o,w':['堂伯外祖母','从父伯外祖母','从父伯姥姥'],
-		'm,f,f,xb,s&l':['从父叔外祖父','从父叔姥爷'],
+		'm,f,f,xb,s&l':['堂叔外祖父','从父叔外祖父','从父叔姥爷'],
-		'm,f,f,xb,s&l,w':['从父叔外祖母','从父叔姥姥'],
+		'm,f,f,xb,s&l,w':['堂叔外祖母','从父叔外祖母','从父叔姥姥'],
 		'm,f,f,xb,s,s':['再从父舅父'],
 		'm,f,f,xb,s,s,w':['再从父舅母'],
 		'm,f,f,xb,s,d':['再从父姨母'],
@@ -726,8 +798,10 @@
 		'm,f,m,xs,d,d':['从母姑表姨母'],
 		'm,f,m,xs,d,d,h':['从母姑表姨父'],
 		// 从父*
-		'm,f,ob':['大外公','大姥爷','x外公','x姥爷'],
+		'm,f,ob':['外伯公','伯外祖父','外伯祖父','伯姥爷','外伯祖','大外公','大姥爷','x外公','x姥爷'],
-		'm,f,lb':['小外公','小姥爷','x外公','x姥爷'],
+		'm,f,ob,w':['外伯婆','伯外祖母','外伯祖母','伯姥姥','大姥姥','外姆婆','小外公','小姥爷','x外公','x姥爷'],
+		'm,f,lb':['外叔公','叔外祖父','外叔祖父','叔姥爷','外叔祖','叔外祖'],
+		'm,f,lb,w':['外叔婆','叔外祖母','外叔祖母','叔姥姥','小姥姥','外姆婆'],
 		// 从父舅表
 		'm,f,xb,s':['堂舅','堂舅爸','堂舅父','堂舅舅','从父舅父','叔伯舅父','叔伯舅'],
 		'm,f,xb,s,w':['堂舅妈','堂舅母','从父舅母','叔伯舅母'],
@@ -758,10 +832,6 @@
 		'm,f,xb,d,d,s,w':['从父舅表甥妇'],
 		'm,f,xb,d,d,d':['从父舅表甥女'],
 		'm,f,xb,d,d,d,h':['从父舅表甥婿'],
-		'm,f,ob':['外伯公','伯外祖父','外伯祖父','伯姥爷','大姥爷','外伯祖'],
-		'm,f,ob,w':['外伯婆','伯外祖母','外伯祖母','伯姥姥','大姥姥','外姆婆'],
-		'm,f,lb':['外叔公','叔外祖父','外叔祖父','叔姥爷','小姥爷','外叔祖','叔外祖'],
-		'm,f,lb,w':['外叔婆','叔外祖母','外叔祖母','叔姥姥','小姥姥','外姆婆'],
 		// 姑表*
 		'm,f,xs':['外姑婆','姑姥姥','姑外祖母','外姑祖母','外太姑母','外姑母'],
 		'm,f,xs,h':['外姑公','姑姥爷','姑外祖父','外姑祖父','外太姑父','外姑丈'],
@@ -945,17 +1015,17 @@
 		'm,m,xs,d,d,d,h':['再从母甥婿'],
 		// 舅表
 		'm,xb':['舅舅','舅父','舅','娘舅','舅仔','母舅','舅爸','舅爹','阿舅','x舅'],
-		'm,xb,w':['舅妈','舅母','妗子','妗妗','妗母','阿妗','x舅妈'],
+		'm,xb,w':['舅妈','舅母','妗子','妗妗','妗妈','妗母','阿妗','x舅妈'],
-		'm,xb,w,f':['舅姻外祖父','姻伯公'],
+		'm,xb,w,f':['舅姻外祖父','舅眷毑父','眷爷爷'],
-		'm,xb,w,m':['舅姻外祖母','姻伯婆'],
+		'm,xb,w,m':['舅姻外祖母','舅眷毑母','眷姥姥'],
 		'm,xb,w,xb':['舅姻舅父','姻舅父'],
 		'm,xb,w,xb,w':['舅姻舅母','姻舅母'],
 		'm,xb,w,xs':['舅姻姨母','姻姨母'],
 		'm,xb,w,xs,h':['舅姻姨父','姻姨父'],
 		'm,xb,s&o':['舅表哥','舅表兄','表哥','表兄'],
-		'm,xb,s&o,w':['舅表嫂','表嫂'],
+		'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,w':['舅表侄妇','表侄妇'],
 		'm,xb,s,s,s':['舅表侄孙男','舅表侄孙','表侄孙'],
@@ -964,18 +1034,20 @@
 		'm,xb,s,s,d,h':['舅表侄孙婿','表侄孙婿'],
 		'm,xb,s,d':['舅表侄女','表侄女','表侄'],
 		'm,xb,s,d,h':['舅表侄婿','表侄婿'],	
-		'm,xb,s,d,s':['舅表侄孙'],
+		'm,xb,s,d,s':['舅表侄外孙男'],
-		'm,xb,s,d,s,w':['舅表侄孙妇'],
+		'm,xb,s,d,s,w':['舅表侄外孙妇'],
-		'm,xb,s,d,d':['舅表侄孙女'],
+		'm,xb,s,d,d':['舅表侄外孙女'],
-		'm,xb,s,d,d,h':['舅表侄孙婿'],
+		'm,xb,s,d,d,h':['舅表侄外孙婿'],
 		'm,xb,d&o':['舅表姐','舅表姊','表姐','表姊'],
-		'm,xb,d&o,h':['舅表姐夫','舅表姊夫','表姐夫','表姐姊','表姐丈','表姊丈'],
+		'm,xb,d&o,h':['舅表姐夫','舅表姊夫','舅表姊婿','表姐夫','表姐姊','表姐丈','表姊丈'],
 		'm,xb,d&l':['舅表妹','表妹'],
-		'm,xb,d&l,h':['舅表妹夫','表妹夫'],
+		'm,xb,d&l,h':['舅表妹夫','舅表妹婿','表妹夫'],
 		'm,xb,d,s':['舅表甥男','表外甥','表甥男'],
+		'm,xb,d,s,w':['舅表甥妇'],
 		'm,xb,d,s,s':['舅表甥孙男','表甥孙男'],
 		'm,xb,d,s,d':['舅表甥孙女','表甥孙女'],
 		'm,xb,d,d':['舅表甥女','表外甥','表甥女'],
+		'm,xb,d,d,h':['舅表甥婿'],
 		'm,xb,d,d,s':['舅表甥外孙男','表甥外孙男'],
 		'm,xb,d,d,d':['舅表甥外孙女','表甥外孙女'],
 		'm,ob':['大舅'],
@@ -988,9 +1060,9 @@
 		'm,ls':['小姨','小姨妈','姨仔'],
 		'm,ls,h':['小姨父','小姨丈'],
 		'm,xs':['姨妈','姨母','姨姨','姨娘','阿姨','姨','x姨','x姨妈'],
-		'm,xs,h':['姨丈','姨父','姨爸','姨爹','x姨丈','x姨父'],
+		'm,xs,h':['姨丈','姨父','姨爸','姨爹','姨婿','姨郎','x姨丈','x姨父'],
-		'm,xs,h,f':['姨姻祖父','姻伯公'],
+		'm,xs,h,f':['姨姻祖父','姻爷爷'],
-		'm,xs,h,m':['姨姻祖母','姻伯婆'],
+		'm,xs,h,m':['姨姻祖母','姻奶奶'],
 		'm,xs,h,ob':['姨姻伯父','姻伯父','姻世伯'],
 		'm,xs,h,ob,w':['姨姻伯母','姻伯母'],
 		'm,xs,h,lb':['姨姻叔父','姻叔父'],
@@ -1003,16 +1075,32 @@
 		'm,xs,s&l,w':['姨弟妇','从母弟妇'],
 		'm,xs,s,s':['姨侄男','从母侄男','姨侄'],
 		'm,xs,s,s,w':['姨侄妇','从母侄妇'],
+		'm,xs,s,s,s':['姨侄孙男','姨侄孙'],
+		'm,xs,s,s,s,w':['姨侄孙妇'],
+		'm,xs,s,s,d':['姨侄孙女'],
+		'm,xs,s,s,d,h':['姨侄孙婿'],
 		'm,xs,s,d':['姨侄女','从母侄女','姨侄'],
 		'm,xs,s,d,h':['姨侄婿','从母侄婿'],
+		'm,xs,s,d,s':['姨侄外孙男','姨侄外孙'],
+		'm,xs,s,d,s,w':['姨侄外孙妇'],
+		'm,xs,s,d,d':['姨侄外孙女'],
+		'm,xs,s,d,d,h':['姨侄外孙婿'],
 		'm,xs,d&o':['姨姐','姨姊','从母姐','从母姊'],
-		'm,xs,d&o,h':['姨姐夫','从母姐夫','从母姊夫','从母姊丈','从母姊婿','从母姊郎'],
+		'm,xs,d&o,h':['姨姐夫','姨姊夫','从母姐夫','从母姊夫','从母姊丈','从母姊婿','从母姊郎'],
 		'm,xs,d&l':['姨妹','从母妹'],
 		'm,xs,d&l,h':['姨妹夫','从母妹夫','从母妹丈','从母妹婿','从母妹郎'],
-		'm,xs,d,s':['姨甥男','从母甥男','姨甥'],
+		'm,xs,d,s':['姨甥男','从母甥男','姨外甥','姨甥'],
 		'm,xs,d,s,w':['姨甥妇','从母甥妇'],
-		'm,xs,d,d':['姨甥女','从母甥女','姨甥'],
+		'm,xs,d,s,s':['姨甥孙男','姨甥孙'],
+		'm,xs,d,s,s,w':['姨甥孙妇'],
+		'm,xs,d,s,d':['姨甥孙女'],
+		'm,xs,d,s,d,h':['姨甥孙婿'],
+		'm,xs,d,d':['姨甥女','从母甥女','姨外甥女','姨甥'],
 		'm,xs,d,d,h':['姨甥婿','从母甥婿'],
+		'm,xs,d,d,s':['姨甥外孙男','姨甥外孙'],
+		'm,xs,d,d,s,w':['姨甥外孙妇'],
+		'm,xs,d,d,d':['姨甥外孙女'],
+		'm,xs,d,d,d,h':['姨甥外孙婿'],
 		// 婆家
 		'h':['老公','丈夫','先生','官人','男人','汉子','夫','夫君','相公','夫婿','良人','爱人','老伴','老头子'],
 		'h,f':['公公','翁亲','老公公'],
@@ -1022,10 +1110,10 @@
 		'h,f,f,lb':['叔祖公','叔祖翁'],
 		'h,f,f,lb,w':['叔祖婆'],
 		'h,f,f,f':['曾祖公','太公翁'],
-		'h,f,f,f,ob':['太伯翁'],
+		'h,f,f,f,ob':['伯曾祖公','太伯翁'],
-		'h,f,f,f,ob,w':['太姆婆'],
+		'h,f,f,f,ob,w':['伯曾祖婆','太姆婆'],
-		'h,f,f,f,lb':['太叔翁'],
+		'h,f,f,f,lb':['叔曾祖公','太叔翁'],
-		'h,f,f,f,lb,w':['太婶婆'],
+		'h,f,f,f,lb,w':['叔曾祖婆','太婶婆'],
 		'h,f,f,m':['曾祖婆','太奶亲'],
 		'h,f,f,xs':['姑祖婆'],
 		'h,f,f,xs,h':['姑祖公'],
@@ -1040,34 +1128,34 @@
 		'h,f,ob,w':['伯婆母','伯婆'],
 		'h,f,lb':['叔公父','叔公','叔翁','叔祖'],
 		'h,f,lb,w':['叔婆母','叔婆','婶婆','婶亲'],
-		'h,f,xb,s&o':['堂大伯子','从父大伯子','堂大伯','从父大伯','夫从兄'],
+		'h,f,xb,s&o':['堂大伯子','从父大伯子','从父大伯兄','堂大伯','从父大伯','夫从兄'],
 		'h,f,xb,s&o,w':['堂大伯嫂','从父大伯嫂','堂大姆','从父大姆','从兄嫂'],
 		'h,f,xb,s&l':['堂小叔弟','从父小叔弟','堂叔仔','从父叔仔','夫从弟'],
 		'h,f,xb,s&l,w':['堂小叔弟妇','从父小叔弟妇','堂小弟','从父小弟','从弟妇'],
 		'h,f,xb,s,s':['堂夫侄男','从父夫侄男'],
 		'h,f,xb,s,d':['堂夫侄女','从父夫侄女'],
-		'h,f,xb,d&o':['堂大姑姐','从父大姑姐'],
+		'h,f,xb,d&o':['堂大姑姐','从父大姑姐','从父大姑姊'],
-		'h,f,xb,d&o,h':['堂大姑姐夫','从父大姑姐夫'],
+		'h,f,xb,d&o,h':['堂大姑姐夫','从父大姑姐夫','从父大姑姊夫'],
 		'h,f,xb,d&l':['堂小姑妹','从父小姑妹'],
 		'h,f,xb,d&l,h':['堂小姑妹夫','从父小姑妹夫'],
 		'h,f,xb,d,s':['堂夫甥男','从父夫甥男'],
 		'h,f,xb,d,d':['堂夫甥女','从父夫甥女'],
 		'h,f,xs':['姑婆母','姑婆'],
 		'h,f,xs,h':['姑公父','姑公'],
-		'h,f,xs,s&o':['姑表大伯子','表大伯'],
+		'h,f,xs,s&o':['姑表大伯子','姑表大伯兄','表大伯'],
 		'h,f,xs,s&o,w':['姑表大伯嫂','表大姆'],
 		'h,f,xs,s&l':['姑表小叔弟','表叔仔'],
 		'h,f,xs,s&l,w':['姑表小叔弟妇','表小弟'],
 		'h,f,xs,s,s':['姑表夫侄男'],
 		'h,f,xs,s,d':['姑表夫侄女'],
-		'h,f,xs,d&o':['姑表大姑姐','表大姑'],
+		'h,f,xs,d&o':['姑表大姑姐','姑表大姑姊','表大姑'],
-		'h,f,xs,d&o,h':['姑表大姑姐夫'],
+		'h,f,xs,d&o,h':['姑表大姑姐夫','姑表大姑姊夫'],
 		'h,f,xs,d&l':['姑表小姑妹','表姑仔'],
 		'h,f,xs,d&l,h':['姑表小姑妹夫'],
 		'h,f,xs,d,s':['姑表夫甥男'],
 		'h,f,xs,d,d':['姑表夫甥女'],
 		'h,m':['婆婆','婆母','姑亲','老婆婆'],
-		'h,m,f':['外祖公','姥公父'],
+		'h,m,f':['外祖公','姥公父','姥公'],
 		'h,m,f,f':['外曾祖公'],
 		'h,m,f,m':['外曾祖婆'],
 		'h,m,f,ob':['伯外祖公'],
@@ -1076,7 +1164,7 @@
 		'h,m,f,lb,w':['叔外祖婆'],
 		'h,m,f,xs':['姑外祖婆'],
 		'h,m,f,xs,h':['姑外祖公'],
-		'h,m,m':['外祖婆','姥婆母'],
+		'h,m,m':['外祖婆','姥婆母','姥婆'],
 		'h,m,m,f':['外曾外祖公'],
 		'h,m,m,m':['外曾外祖婆'],
 		'h,m,m,xb':['舅外祖公'],
@@ -1085,28 +1173,28 @@
 		'h,m,m,xs,h':['姨外祖公'],
 		'h,m,xb':['舅公父','舅公'],
 		'h,m,xb,w':['舅婆母','舅婆'],
-		'h,m,xb,s&o':['舅表大伯子','表大伯'],
+		'h,m,xb,s&o':['舅表大伯子','舅表大伯兄','表大伯'],
 		'h,m,xb,s&o,w':['舅表大伯嫂','表大姆'],
 		'h,m,xb,s&l':['舅表小叔弟','表叔仔'],
 		'h,m,xb,s&l,w':['舅表小叔弟妇','表小弟'],
 		'h,m,xb,s,s':['舅表夫侄男'],
 		'h,m,xb,s,d':['舅表夫侄女'],
-		'h,m,xb,d&o':['舅表大姑姐','表大姑'],
+		'h,m,xb,d&o':['舅表大姑姐','舅表大姑姊','表大姑'],
-		'h,m,xb,d&o,h':['舅表大姑姐夫'],
+		'h,m,xb,d&o,h':['舅表大姑姐夫','舅表大姑姊夫'],
 		'h,m,xb,d&l':['舅表小姑妹','表姑仔'],
 		'h,m,xb,d&l,h':['舅表小姑妹夫'],
 		'h,m,xb,d,s':['舅表夫甥男'],
 		'h,m,xb,d,d':['舅表夫甥女'],
 		'h,m,xs':['姨婆母','姨婆'],
 		'h,m,xs,h':['姨公父','姨公'],
-		'h,m,xs,s&o':['姨大伯子','从母大伯子','姨大伯','从母大伯'],
+		'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,m,xs,d&o,h':['姨大姑姐夫','从母大姑姐夫'],
+		'h,m,xs,d&o,h':['姨大姑姐夫','从母大姑姊夫','从母大姑姐夫'],
 		'h,m,xs,d&l':['姨小姑妹','从母小姑妹'],
 		'h,m,xs,d&l,h':['姨小姑妹夫','从母小姑妹夫'],
 		'h,m,xs,d,s':['姨夫甥男','从母夫甥男'],
@@ -1116,8 +1204,8 @@
 		'h,lb':['小叔子','小叔弟'],
 		'h,lb,w':['小婶子','叔嫂','小叔妇','小叔媳妇','小叔弟妇','妯娌'],
 		'h,xb':['伯叔'],
-		'h,xb,s':['叔侄男','叔伯男','从男','婆家侄男'],
+		'h,xb,s':['婆家侄','叔侄男','叔伯男','从男','婆家侄男'],
-		'h,xb,s,w':['叔侄妇'],
+		'h,xb,s,w':['叔侄媳妇','叔伯侄妇','叔伯妇','叔侄妇'],
 		'h,xb,s,s':['叔侄孙男'],
 		'h,xb,s,s,w':['叔侄孙妇'],
 		'h,xb,s,d':['叔侄孙女'],
@@ -1133,7 +1221,7 @@
 		'h,ls':['小姑子','小姑','小姑妹','姑仔','夫妹'],
 		'h,ls,h':['小姑夫','小亘子','小姑妹夫'],
 		'h,xs,s':['姑甥男','姑男','婆家甥男'],
-		'h,xs,s,w':['姑甥妇'],
+		'h,xs,s,w':['姑甥妇','姑妇'],
 		'h,xs,s,s':['姑甥孙男'],
 		'h,xs,s,s,w':['姑甥孙妇'],
 		'h,xs,s,d':['姑甥孙女'],
@@ -1193,8 +1281,8 @@
 		'w,f,xs,d&o,h':['姑表襟兄','表襟兄'],
 		'w,f,xs,d&l':['姑表小姨妹','表姨仔','表内妹'],
 		'w,f,xs,d&l,h':['姑表襟弟','表襟弟'],
-		'w,m':['岳母','丈母娘','丈母','泰水'],
+		'w,m':['岳母','丈母娘','老丈母','丈母','泰水'],
-		'w,m,f':['外祖岳父','外太岳父','姥岳父'],
+		'w,m,f':['外祖岳父','外太岳父','姥岳父','姥丈人'],
 		'w,m,f,f':['外曾祖丈人'],
 		'w,m,f,m':['外曾祖丈母'],
 		'w,m,f,ob':['伯外祖岳父'],
@@ -1203,7 +1291,7 @@
 		'w,m,f,lb,w':['叔外祖岳母'],
 		'w,m,f,xs':['姑外祖岳母'],
 		'w,m,f,xs,h':['姑外祖岳父'],
-		'w,m,m':['外祖岳母','外太岳母','姥岳母'],
+		'w,m,m':['外祖岳母','外太岳母','姥岳母','姥丈母'],
 		'w,m,m,f':['外曾外祖丈人'],
 		'w,m,m,m':['外曾外祖丈母'],
 		'w,m,m,xb':['舅外祖岳父'],
@@ -1234,15 +1322,19 @@
 		'w,ob,w':['舅嫂','大舅妇','大舅嫂','大舅媳妇','大妗子','内嫂','妻兄嫂'],
 		'w,lb':['小舅子','小舅弟','内弟','妻弟','妻舅','舅弟'],
 		'w,lb,w':['舅弟媳','小舅妇','小舅弟妇','小舅媳妇','小妗子','妻妹夫'],
-		'w,xb,s':['内侄男','内侄','妻侄男','舅侄男','岳侄男','丈人侄男','舅男'],
+		'w,xb,s':['内侄','内侄男','妻侄男','舅侄男','岳侄男','丈人侄男','舅男'],
-		'w,xb,s,w':['内侄妇','内侄媳妇','妻侄妇','舅侄妇','岳侄妇','丈人侄妇'],
+		'w,xb,s,w':['内侄妇','内侄媳妇','妻侄妇','舅侄妇','岳侄妇','丈人侄妇','舅妇'],
-		'w,xb,s,s':['内侄孙男','妻侄孙男'],
+		'w,xb,s,s':['内侄孙','内侄孙男','妻侄孙男'],
 		'w,xb,s,s,w':['内侄孙妇','妻侄孙妇'],
+		'w,xb,s,s,s':['内曾侄孙','内曾侄孙男'],
+		'w,xb,s,s,s,w':['内曾侄孙妇'],
+		'w,xb,s,s,d':['内曾侄孙女'],
+		'w,xb,s,s,d,h':['内曾侄孙婿'],
 		'w,xb,s,d':['内侄孙女','妻侄孙女'],
 		'w,xb,s,d,h':['内侄孙婿','妻侄孙婿'],
 		'w,xb,d':['内侄女','内侄','妻侄女','舅侄女','岳侄女','丈人侄女','舅女'],
 		'w,xb,d,h':['内侄婿','妻侄婿','舅侄婿','岳侄婿','丈人侄婿'],
-		'w,xb,d,s':['内侄外孙男','姨侄外孙男'],
+		'w,xb,d,s':['内侄外孙','内侄外孙男','姨侄外孙男'],
 		'w,xb,d,s,w':['内侄外孙妇','姨侄外孙妇'],
 		'w,xb,d,d':['内侄外孙女','姨侄外孙女'],
 		'w,xb,d,d,h':['内侄外孙婿','姨侄外孙婿'],
@@ -1251,7 +1343,7 @@
 		'w,ls':['小姨子','小姨妹','妻妹','小妹儿'],
 		'w,ls,h':['小姨夫','小姨妹夫','襟弟','连襟','连桥','姨夫'],
 		'w,xs,s':['内甥男','内甥','妻甥男','姨甥男','岳甥男','丈人甥男','姨男','从男'],
-		'w,xs,s,w':['内甥妇','姨甥妇','姨甥妇','岳甥妇','丈人甥妇'],
+		'w,xs,s,w':['内甥妇','姨甥妇','岳甥妇','丈人甥妇','姨妇'],
 		'w,xs,s,s':['内甥孙男','姨甥孙男'],
 		'w,xs,s,s,w':['内甥孙妇','姨甥孙妇'],
 		'w,xs,s,d':['内甥孙女','姨甥孙女'],
@@ -1399,8 +1491,8 @@
 		'0,xs,h,xs,d':['姨姻姑女'],
 		'1,xs,h,xs,d':['姑姻姑女'],
 		'xs,s':['外甥','外甥男','甥男','甥儿','甥子','外甥儿','外甥子','外甥儿子'],
-		'xs,s,w':['甥媳妇','外甥媳妇','甥妇'],
+		'xs,s,w':['外甥媳妇','甥媳妇','甥妇'],
-		'xs,s,s':['甥孙男'],
+		'xs,s,s':['甥孙'],
 		'xs,s,s,w':['甥孙妇'],
 		'xs,s,s,s':['甥曾孙'],
 		'xs,s,s,s,w':['甥曾孙妇'],
@@ -1421,7 +1513,7 @@
 		'xs,s,d,d,s':['甥曾外曾外孙'],
 		'xs,s,d,d,d':['甥曾外曾外孙女'],
 		'xs,d':['外甥女','甥女','外甥囡'],
-		'xs,d,h':['甥女婿','外甥女婿','甥婿'],
+		'xs,d,h':['外甥女婿','甥女婿','甥婿'],
 		'xs,d,s':['甥外孙'],
 		'xs,d,s,w':['甥外孙妇'],
 		'xs,d,s,s':['甥外曾孙'],
@@ -1443,56 +1535,89 @@
 		'xs,d,d,d,s':['甥外曾外曾外孙'],
 		'xs,d,d,d,d':['甥外曾外曾外孙女'],
 		//自家
-		's':['儿子','男儿','仔','阿仔','仔仔','x儿子','孩子','孩儿'],
+		's':['儿子','男儿','儿','仔','阿仔','仔仔','x儿子'],
 		's,w':['儿媳','儿媳妇','新妇'],
 		's,s':['孙子','孙男','孙儿','x孙子','孙'],
-		's,s,w':['孙媳','孙媳妇','孙妇'],
+		's,s,w':['孙媳妇','孙媳','孙妇'],
 		's,s,w,xb':['姻家再侄'],
 		's,s,w,xs':['姻家再侄'],
-		's,s,s':['曾孙','曾孙男'],
+		's,s,s':['曾孙','曾孙男','重孙'],
 		's,s,s,w':['曾孙妇'],
 		's,s,s,s':['玄孙','元孙','膀孙'],
-		's,s,s,d':['玄孙女'],
+		's,s,s,s,w':['玄孙媳妇'],
 		's,s,s,s,s':['来孙'],
-		's,s,s,s,d':['来孙女'],
+		's,s,s,s,s,w':['来孙媳妇'],
 		's,s,s,s,s,s':['晜孙'],
-		's,s,s,s,s,d':['晜孙女'],
+		's,s,s,s,s,s,w':['晜孙媳妇'],
 		's,s,s,s,s,s,s':['仍孙'],
-		's,s,s,s,s,s,d':['仍孙女'],
+		's,s,s,s,s,s,s,w':['仍孙媳妇'],
 		's,s,s,s,s,s,s,s':['云孙'],
-		's,s,s,s,s,s,s,d':['云孙女'],
 		's,s,s,s,s,s,s,s,s':['耳孙'],
+		's,s,s,s,s,s,s,s,s,w':['耳孙媳妇'],
 		's,s,s,s,s,s,s,s,d':['耳孙女'],
-		's,s,d':['曾孙女','曾孙'],
+		's,s,s,s,s,s,s,s,d,h':['耳孙女婿'],
+		's,s,s,s,s,s,s,d':['云孙女'],
+		's,s,s,s,s,s,s,d,h':['云孙女婿'],
+		's,s,s,s,s,s,s,d,s':['耳外孙'],
+		's,s,s,s,s,s,s,d,s,w':['耳外孙媳妇'],
+		's,s,s,s,s,s,s,d,d':['耳外孙女'],
+		's,s,s,s,s,s,s,d,d,h':['耳外孙女婿'],
+		's,s,s,s,s,s,d':['仍孙女'],
+		's,s,s,s,s,s,d,h':['仍孙女婿'],
+		's,s,s,s,s,s,d,s':['云外孙'],
+		's,s,s,s,s,s,d,s,w':['云外孙媳妇'],
+		's,s,s,s,s,s,d,d':['云外孙女'],
+		's,s,s,s,s,s,d,d,h':['云外孙女婿'],
+		's,s,s,s,s,d':['晜孙女'],
+		's,s,s,s,s,d,h':['晜孙女婿'],
+		's,s,s,s,s,d,s':['仍外孙'],
+		's,s,s,s,s,d,s,w':['仍外孙媳妇'],
+		's,s,s,s,s,d,d':['仍外孙女'],
+		's,s,s,s,s,d,d,h':['仍外孙女婿'],
+		's,s,s,s,d':['来孙女'],
+		's,s,s,s,d,h':['来孙女婿'],
+		's,s,s,s,d,s':['晜外孙'],
+		's,s,s,s,d,s,w':['晜外孙媳妇'],
+		's,s,s,s,d,d':['晜外孙女'],
+		's,s,s,s,d,d,h':['晜外孙女婿'],
+		's,s,s,d':['玄孙女'],
+		's,s,s,d,h':['玄孙女婿'],
+		's,s,s,d,s':['来外孙'],
+		's,s,s,d,s,w':['来外孙媳妇'],
+		's,s,s,d,d':['来外孙女'],
+		's,s,s,d,d,h':['来外孙女婿'],
+		's,s,d':['曾孙女'],
 		's,s,d,h':['曾孙婿'],
-		's,s,d,s':['玄外孙',],
+		's,s,d,s':['玄外孙'],
+		's,s,d,s,w':['玄外孙媳妇'],
 		's,s,d,d':['玄外孙女'],
+		's,s,d,d,h':['玄外孙女婿'],
 		's,d':['孙女','孙囡'],
-		's,d,h':['孙婿','孙女婿'],
+		's,d,h':['孙女婿','孙婿'],
 		's,d,h,xb':['姻家再侄男','姻家再侄'],
 		's,d,h,xs':['姻家再侄女','姻家再侄'],
 		's,d,s':['曾外孙'],
-		's,d,s,w':['曾外孙妇'],
+		's,d,s,w':['曾外孙媳妇','曾外孙妇'],
 		's,d,s,s':['曾外曾孙'],
 		's,d,s,d':['曾外曾孙女'],
 		's,d,d':['曾外孙女'],
-		's,d,d,h':['曾外孙婿'],
+		's,d,d,h':['曾外孙女婿','曾外孙婿'],
 		's,d,d,s':['曾外曾外孙'],
 		's,d,d,d':['曾外曾外孙女'],
-		'd':['女儿','千金','闺女','女','阿女','女女','掌上明珠','乖囡','囡囡','姑娘','x女儿','孩子','孩儿'],
+		'd':['女儿','千金','闺女','女','阿女','女女','掌上明珠','乖囡','囡囡','姑娘','x女儿'],
 		'd,h':['女婿','姑爷','女婿子','女婿儿','儿婿'],
 		'd,s':['外孙'],
-		'd,s,w':['外孙妇','外孙媳妇'],
+		'd,s,w':['外孙媳妇','外孙妇'],
 		'd,s,s':['外曾孙','重外孙'],
-		'd,s,s,w':['外曾孙妇'],
+		'd,s,s,w':['外曾孙媳妇','外曾孙妇'],
 		'd,s,s,s':['外玄孙'],
 		'd,s,s,d':['外玄孙女'],
 		'd,s,d':['外曾孙女','重外孙女'],
-		'd,s,d,h':['外曾孙婿','重外孙婿'],
+		'd,s,d,h':['外曾孙女婿','外曾孙婿','重外孙婿'],
 		'd,s,d,s':['外玄外孙'],
 		'd,s,d,d':['外玄外孙女'],
 		'd,d':['外孙女','外孙囡'],
-		'd,d,h':['外孙婿','外孙女婿'],
+		'd,d,h':['外孙女婿','外孙婿'],
 		'd,d,s':['外曾外孙'],
 		'd,d,s,w':['外曾外孙妇'],
 		'd,d,s,s':['外曾外曾孙'],

dist/relationship.min.js

@@ -1,2 +1,2 @@
-!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.replace(/我的?/,"").replace(/家的?/,"的").split("的"),x=[],m=!0;f.length;){var d=f.shift(),b=[],h=!1;for(var l in w){var o=w[l];o.indexOf(d)>-1&&(!l&&f.length||b.push(l),h=!0)}if(h||(m=!1),x.length){for(var e=[],l=0;l<x.length;l++)for(var r=0;r<b.length;r++)e.push(x[l]+","+b[r]);x=e}else for(var l=0;l<b.length;l++)x.push(","+b[l])}return m?x:[]}function f(s,f){var x=[],m={};if(f<0?0==s.indexOf(",w")?s=",1"+s:0==s.indexOf(",h")&&(s=",0"+s):0==s.indexOf(",1")||0==s.indexOf(",0")||f>-1&&(s=","+f+s),s.match(/,[w0],w|,[h1],h/))return!1;var d=function(s){var f="";if(!m[s]){m[s]=!0;var w=!0;do{f=s;for(var h in b){var l=b[h];if(s=s.replace(l.exp,l.str),s.indexOf("#")>-1){for(var o=s.split("#"),e=0;e<o.length;e++)d(o[e]);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 d(s),h(x)}function x(s){var f=[],x=function(s){var f=[];for(var x in w)if(x.replace(/&[ol]/g,"")==s)f.push(w[x][0]);else for(var m=s;m.match(/[ol](b|s)/);)if(m=m.replace(/[ol](b|s)/,"x$1"),m==x){f.push(w[x][0]);break}return f};if(w[s])f.push(w[s][0]);else if(f=x(s),f.length||(s=s.replace(/&[ol]/g,""),f=x(s)),f.length||(s=s.replace(/[ol](b|s)/g,"x$1"),f=x(s)),!f.length){var m=s.replace(/x/g,"l");f=x(m);var d=s.replace(/x/g,"o");f=f.concat(x(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 d=(","+f+","+s).replace(/,[fhs]|,[olx]b/g,",1").replace(/,[mwd]|,[olx]s/g,",0");d=d.substring(0,d.lastIndexOf(","));for(var b=s.split(",").reverse(),w=d.split(",").reverse(),h=[],l=0;l<b.length;l++)h.push(x[b[l]][w[l]]);return h.join(",")+m}return""}function d(s){for(var f=s.split(","),x=[],m=0;m<f.length;m++){var d=f[m].replace(/&[ol]/,"");x.push(w[d][0])}return x.join("的")}var b=[{exp:/^(.+)&o([^#]+)&l/g,str:"$1$2"},{exp:/^(.+)&l([^#]+)&o/g,str:"$1$2"},{exp:/(,[ds],(.+),[ds])&[ol]/g,str:"$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:/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:/,[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"},{exp:/(.+)?\[([^\[\]]+)\|([^\[\]]+)?\](.+)?/g,str:"$1$2$4#$1$3$4"}],w={"":["自己","我","本人","在下"],"[f,f|f,m|m,f|m,m]":["祖辈","祖父母"],"[f|m]":["父母","爹娘","爹妈","爸妈","双亲","二亲","两亲","二老","高堂"],"[h,f|h,m]":["公婆"],"[w,f|w,m]":["岳父母"],"[xb|xs]":["兄弟姐妹","同胞","手足"],"[s|d]":["子女","儿女","小孩","孩子"],"[s,s|s,d|d,s|d,d]":["孙辈"],f:["爸爸","父亲","阿爸","老爸","老窦","爸","父","爹","爹爹","爹地","爹啲","老爹","大大","老爷子"],"f,f":["爷爷","祖父","阿爷","奶爷","阿公","老爷"],"f,f,f":["曾祖父","太爷","太爷爷","太公","祖公","祖奶爷","太老爷"],"f,f,f,f":["高祖父","老太奶爷","老太爷","祖太爷","祖太爷爷","祖太公","高王父"],"f,f,f,f,f":["天祖父"],"f,f,f,f,f,f":["烈祖父"],"f,f,f,f,f,m":["烈祖母"],"f,f,f,f,f,f,f":["太祖父"],"f,f,f,f,f,f,m":["太祖母"],"f,f,f,f,f,f,f,f":["远祖父"],"f,f,f,f,f,f,f,m":["远祖母"],"f,f,f,f,f,f,f,f,f":["鼻祖父"],"f,f,f,f,f,f,f,f,m":["鼻祖母"],"f,f,f,f,m":["天祖母"],"f,f,f,f,ob":["伯高祖父"],"f,f,f,f,ob,w":["伯高祖母"],"f,fLine 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.replace(/我的?/,"").replace(/家的?/,"的").split("的"),x=[],d=!0;f.length;){var m=f.shift(),b=[],h=!1;for(var l in w){var o=w[l];o.indexOf(m)>-1&&(!l&&f.length||b.push(l),h=!0)}if(h||(d=!1),x.length){for(var e=[],l=0;l<x.length;l++)for(var r=0;r<b.length;r++)e.push(x[l]+","+b[r]);x=e}else for(var l=0;l<b.length;l++)x.push(","+b[l])}return d?x:[]}function f(s,f){var x=[],d={};if(f<0?0==s.indexOf(",w")?s=",1"+s:0==s.indexOf(",h")&&(s=",0"+s):0==s.indexOf(",1")||0==s.indexOf(",0")||f>-1&&(s=","+f+s),s.match(/,[w0],w|,[h1],h/))return!1;var m=function(s){var f="";if(!d[s]){d[s]=!0;var w=!0;do{f=s;for(var h in b){var l=b[h];if(s=s.replace(l.exp,l.str),s.indexOf("#")>-1){for(var o=s.split("#"),e=0;e<o.length;e++)m(o[e]);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 m(s),h(x)}function x(s){var f=[],x=function(s){var f=[];for(var x in w)if(x.replace(/&[ol]/g,"")==s)f.push(w[x][0]);else for(var d=s;d.match(/[ol](b|s)/);)if(d=d.replace(/[ol](b|s)/,"x$1"),d==x){f.push(w[x][0]);break}return f};if(w[s])f.push(w[s][0]);else if(f=x(s),f.length||(s=s.replace(/&[ol]/g,""),f=x(s)),f.length||(s=s.replace(/[ol](b|s)/g,"x$1"),f=x(s)),!f.length){var d=s.replace(/x/g,"l");f=x(d);var m=s.replace(/x/g,"o");f=f.concat(x(m))}return f}function d(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"]},d="";if(s.indexOf("&o")>-1?d="&l":s.indexOf("&l")>-1&&(d="&o"),s){s=s.replace(/&[ol]/g,""),f=f?1:0;var m=(","+f+","+s).replace(/,[fhs]|,[olx]b/g,",1").replace(/,[mwd]|,[olx]s/g,",0");m=m.substring(0,m.lastIndexOf(","));for(var b=s.split(",").reverse(),w=m.split(",").reverse(),h=[],l=0;l<b.length;l++)h.push(x[b[l]][w[l]]);return h.join(",")+d}return""}function m(s){for(var f=s.split(","),x=[],d=0;d<f.length;d++){var m=f[d].replace(/&[ol]/,"");x.push(w[m][0])}return x.join("的")}var b=[{exp:/^(.+)&o([^#]+)&l/g,str:"$1$2"},{exp:/^(.+)&l([^#]+)&o/g,str:"$1$2"},{exp:/(,[ds],(.+),[ds])&[ol]/g,str:"$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:/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:/,[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"},{exp:/(.+)?\[([^\[\]\|]+?)\|([^\[\]\|]+?)?\](.+)?/g,str:"$1$2$4#$1$3$4"}],w={"":["自己","我","本人","在下"],"[f,f|f,m|m,f|m,m]":["祖辈","祖父母"],"[f|m]":["父母","爹娘","爹妈","爸妈","双亲","二亲","两亲","二老","高堂"],"[h,f|h,m]":["公婆"],"[w,f|w,m]":["岳父母"],"[xb|xs]":["兄弟姐妹","同胞","手足"],"[f,xb,s&o|f,xb,s&l]":["堂兄弟"],"[f,xb,d&o|f,xb,d&l]":["堂姐妹","堂姊妹"],"[f,xs,s&o|f,xs,s&l|m,xb,s&o|m,xb,s&l]":["表兄弟"],"[f,xs,d&o|f,xs,d&l|m,xb,d&o|m,xb,d&l]":["表姐妹","表姊妹"],"[s|d]":["子女","儿女","小孩","孩子","孩儿"],"[s,s|s,d|d,s|d,d]":["孙辈"],f:["爸爸","父亲","阿爸","老爸","老窦","爸","父","爹","爹爹","爹地","爹啲","老爹","大大","老爷子"],"f,f":["爷爷","祖父","阿爷","奶爷","阿公","老爷"],"f,f,f":["曾祖父","曾祖","太爷","太爷爷","太公","祖公","祖奶爷","太老爷"],"f,f,f,f":["高祖父","老太奶爷","老太爷","祖太爷","祖太爷爷","祖太公","高王父"],"f,f,f,f,f":["天祖父","高祖"],"f,f,f,f,f,f":["烈祖父","烈祖"],"f,f,f,f,f,f,f":["太祖父","太祖"],"f,f,f,f,f,fLine truncated
-"w,m,f,xs":["姑外祖岳母"],"w,m,f,xs,h":["姑外祖岳父"],"w,m,m":["外祖岳母","外太岳母","姥岳母"],"w,m,m,f":["外曾外祖丈人"],"w,m,m,m":["外曾外祖丈母"],"w,m,m,xb":["舅外祖岳父"],"w,m,m,xb,w":["舅外祖岳母"],"w,m,m,xs":["姨外祖岳母"],"w,m,m,xs,h":["姨外祖岳父"],"w,m,xb":["舅岳父"],"w,m,xb,w":["舅岳母"],"w,m,xb,s&o":["舅表大舅兄","表大舅","表内兄"],"w,m,xb,s&o,w":["舅表内嫂","表内嫂"],"w,m,xb,s&l":["舅表小舅弟","表舅仔","表内弟"],"w,m,xb,s&l,w":["舅表内弟妇","表内弟妇"],"w,m,xb,d&o":["舅表大姨姊","表大姨","表内姐"],"w,m,xb,d&o,h":["舅表襟兄","表襟兄"],"w,m,xb,d&l":["舅表小姨妹","表姨仔","表内妹"],"w,m,xb,d&l,h":["舅表襟弟","表襟弟"],"w,m,xs":["姨岳母"],"w,m,xs,h":["姨岳父"],"w,m,xs,s&o":["姨母大舅兄","从母大舅兄","姨大舅","姨内兄"],"w,m,xs,s&o,w":["姨母内嫂","从母内嫂"],"w,m,xs,s&l":["姨小舅弟","从母小舅弟","姨舅仔","姨内弟"],"w,m,xs,s&l,w":["姨内弟妇","从母内弟妇"],"w,m,xs,d&o":["姨大姨姊","从母大姨姊","姨大姨","姨内姐"],"w,m,xs,d&o,h":["姨襟兄","从母襟兄"],"w,m,xs,d&l":["姨小姨妹","从母小姨妹","姨姨仔","姨内妹"],"w,m,xs,d&l,h":["姨襟弟","从母襟弟"],"w,ob":["大舅子","大舅哥","大舅兄","内兄","妻兄","妻舅","舅兄"],"w,ob,w":["舅嫂","大舅妇","大舅嫂","大舅媳妇","大妗子","内嫂","妻兄嫂"],"w,lb":["小舅子","小舅弟","内弟","妻弟","妻舅","舅弟"],"w,lb,w":["舅弟媳","小舅妇","小舅弟妇","小舅媳妇","小妗子","妻妹夫"],"w,xb,s":["内侄男","内侄","妻侄男","舅侄男","岳侄男","丈人侄男","舅男"],"w,xb,s,w":["内侄妇","内侄媳妇","妻侄妇","舅侄妇","岳侄妇","丈人侄妇"],"w,xb,s,s":["内侄孙男","妻侄孙男"],"w,xb,s,s,w":["内侄孙妇","妻侄孙妇"],"w,xb,s,d":["内侄孙女","妻侄孙女"],"w,xb,s,d,h":["内侄孙婿","妻侄孙婿"],"w,xb,d":["内侄女","内侄","妻侄女","舅侄女","岳侄女","丈人侄女","舅女"],"w,xb,d,h":["内侄婿","妻侄婿","舅侄婿","岳侄婿","丈人侄婿"],"w,xb,d,s":["内侄外孙男","姨侄外孙男"],"w,xb,d,s,w":["内侄外孙妇","姨侄外孙妇"],"w,xb,d,d":["内侄外孙女","姨侄外孙女"],"w,xb,d,d,h":["内侄外孙婿","姨侄外孙婿"],"w,os":["大姨子","大姨姐","大姨姊","妻姐"],"w,os,h":["大姨夫","大姨姐夫","大姨姊夫","襟兄","连襟","连桥","姨夫"],"w,ls":["小姨子","小姨妹","妻妹","小妹儿"],"w,ls,h":["小姨夫","小姨妹夫","襟弟","连襟","连桥","姨夫"],"w,xs,s":["内甥男","内甥","妻甥男","姨甥男","岳甥男","丈人甥男","姨男","从男"],"w,xs,s,w":["内甥妇","姨甥妇","姨甥妇","岳甥妇","丈人甥妇"],"w,xs,s,s":["内甥孙男","姨甥孙男"],"w,xs,s,s,w":["内甥孙妇","姨甥孙妇"],"w,xs,s,d":["内甥孙女","姨甥孙女"],"w,xs,s,d,h":["内甥孙婿","姨甥孙婿"],"w,xs,d":["内甥女","内甥","姨甥女","妻外甥女","丈人甥女","姨女","从女"],"w,xs,d,h":["内甥婿","姨甥婿","妻甥婿","岳甥婿","丈人甥婿"],"w,xs,d,s":["内甥外孙男","姨甥外孙男"],"w,xs,d,s,w":["内甥外孙妇","姨甥外孙妇"],"w,xs,d,d":["内甥外孙女","姨甥外孙女"],"w,xs,d,d,h":["内甥外孙婿","姨甥外孙婿"],ob:["哥哥","哥","兄","阿哥","大佬","老哥","兄长","胞哥","大哥","x哥"],"ob,w":["嫂子","嫂","嫂嫂","阿嫂","兄嫂","大嫂","x嫂"],"ob,w,f":["兄姻父","兄眷父","姻父"],"ob,w,m":["兄姻母","兄眷母","姻母"],"ob,w,ob":["兄姻兄","兄眷兄","姻兄"],"ob,w,ob,w":["兄姻兄妇","兄眷兄妇"],"ob,w,lb":["兄姻弟","兄眷弟","姻弟"],"ob,w,lb,w":["兄姻弟妇","兄眷弟妇"],"ob,w,xb,s":["兄姻侄男","兄眷侄男"],"ob,w,xb,d":["兄姻侄女","兄眷侄女"],"ob,w,os":["兄姻姊","兄眷姊","姻姊"],"ob,w,os,h":["兄姻姊婿","兄眷姊婿"],"ob,w,ls":["兄姻妹","兄眷妹","姻妹"],"ob,w,ls,h":["兄姻妹婿"],"ob,w,xs,s":["兄姻甥男","兄眷甥男"],"ob,w,xs,d":["兄姻甥女","兄眷甥女"],lb:["弟弟","弟","细佬","胞弟","老弟","x弟"],"lb,w":["弟妹","弟媳","弟媳妇","弟妇","x弟妹"],"lb,w,f":["弟姻父","姻父"],"lb,w,m":["弟姻母","姻母"],"lb,w,ob":["弟姻兄","弟眷兄","姻兄"],"lb,w,ob,w":["弟姻兄妇","弟眷兄妇"],"lb,w,lb":["弟姻弟","弟眷弟","姻弟"],"lb,w,lb,w":["弟姻弟妇","弟眷弟妇"],"lb,w,xb,s":["弟姻侄男","弟眷侄男"],"lb,w,xb,d":["弟姻侄女","弟眷侄女"],"lb,w,os":["弟姻姊","弟眷姊","姻姊"],"lb,w,os,h":["弟姻姊婿","弟眷姊婿"],"lb,w,ls":["弟姻妹","弟眷妹","姻妹"],"lb,w,ls,h":["弟姻妹婿","弟眷妹婿"],"lb,w,xs,s":["弟姻甥男","弟眷甥男"],"lb,w,xs,d":["弟姻甥女","弟眷甥女"],xb:["兄弟"],"xb,w,f":["姻伯父","姻世伯"],"xb,w,f,f":["姻伯公"],"xb,w,f,m":["姻伯婆"],"xb,w,m":["姻伯母"],"0,xb,w,xb,s":["舅眷舅男"],"1,xb,w,xb,s":["叔眷舅男"],"0,xb,Line truncated
+"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":["伯叔"],"h,xb,s":["婆家侄","叔侄男","叔伯男","从男","婆家侄男"],"h,xb,s,w":["叔侄媳妇","叔伯侄妇","叔伯妇","叔侄妇"],"h,xb,s,s":["叔侄孙男"],"h,xb,s,s,w":["叔侄孙妇"],"h,xb,s,d":["叔侄孙女"],"h,xb,s,d,h":["叔侄孙婿"],"h,xb,d":["叔侄女","叔伯女","从女","婆家侄女"],"h,xb,d,h":["叔侄婿"],"h,xb,d,s":["叔侄外孙男"],"h,xb,d,s,w":["叔侄外孙妇"],"h,xb,d,d":["叔侄外孙女"],"h,xb,d,d,h":["叔侄外孙婿"],"h,os":["大姑子","大姑","大娘姑","大姑姊","夫姐"],"h,os,h":["大姑夫","姊丈","大姑姐夫","大姑姊夫"],"h,ls":["小姑子","小姑","小姑妹","姑仔","夫妹"],"h,ls,h":["小姑夫","小亘子","小姑妹夫"],"h,xs,s":["姑甥男","姑男","婆家甥男"],"h,xs,s,w":["姑甥妇","姑妇"],"h,xs,s,s":["姑甥孙男"],"h,xs,s,s,w":["姑甥孙妇"],"h,xs,s,d":["姑甥孙女"],"h,xs,s,d,h":["姑甥孙婿"],"h,xs,d":["姑甥女","姑女","婆家甥女"],"h,xs,d,h":["姑甥婿"],"h,xs,d,s":["姑甥外孙男"],"h,xs,d,s,w":["姑甥外孙妇"],"h,xs,d,d":["姑甥外孙女"],"h,xs,d,d,h":["姑甥外孙婿"],w:["老婆","妻子","太太","媳妇儿","媳妇","夫人","女人","婆娘","妻","内人","娘子","爱人","爱妻","老伴","老太婆"],"w,f":["岳父","岳丈","老丈人","丈人","泰山","妻父"],"w,f,f":["祖岳父","太岳父","奶岳父"],"w,f,f,f":["曾祖丈人"],"w,f,f,m":["曾祖丈母"],"w,f,f,f,xb,s,s&o":["姻伯丈"],"w,f,f,f,xb,s,s&o,w":["姻伯丈"],"w,f,f,f,xb,s,s&l":["姻叔丈"],"w,f,f,f,xb,s,s&l,w":["姻婶"],"w,f,f,ob":["伯祖岳父","太伯岳"],"w,f,f,ob,w":["伯祖岳母","太伯岳母"],"w,f,f,lb,":["叔祖岳父","太叔岳"],"w,f,f,lb,w":["叔祖岳母","太叔岳母"],"w,f,f,xb,s&o":["姻伯"],"w,f,f,xb,s&o,w":["姻姆"],"w,f,f,xb,s&l":["姻叔"],"w,f,f,xb,s&l,w":["姻婶"],"w,f,f,xs":["姑祖岳父母","太姑岳母"],"w,f,f,xs,h":["姑祖岳父","太姑岳父"],"w,f,m":["祖岳母","太岳母","奶岳母"],"w,f,m,f":["曾外祖丈人"],"w,f,m,m":["曾外祖丈母"],"w,f,m,xb":["舅祖岳父","太舅岳父"],"w,f,m,xb,w":["舅祖岳母","太舅岳母"],"w,f,m,xs":["姨祖岳母","太姨岳母"],"w,f,m,xs,h":["姨祖岳父","太姨岳父"],"w,f,xb,s&o":["堂大舅兄","从父大舅兄","堂大舅","堂内兄"],"w,f,xb,s&o,w":["堂内嫂","从父内嫂"],"w,f,xb,s&l":["堂小舅弟","从父小舅弟","堂舅仔","堂内弟"],"w,f,xb,s&l,w":["堂内弟妇","从父内弟妇"],"w,f,xb,d&o":["堂大姨姊","从父大姨姊","堂大姨","堂内姐"],"w,f,xb,d&o,h":["堂父襟兄","从父襟兄"],"w,f,xb,d&l":["堂小姨妹","从父小姨妹","堂姨仔","堂内妹"],"w,f,xb,d&l,h":["堂襟弟","从父襟弟"],"w,f,ob":["伯岳","伯岳父"],"w,f,ob,w":["伯岳母"],"w,f,lb":["叔岳","叔岳父"],"w,f,lb,w":["叔岳母"],"w,f,xs":["姑岳母"],"w,f,xs,h":["姑岳父"],"w,f,xs,s&o":["姑表大舅兄","表大舅","表内兄"],"w,f,xs,s&o,w":["姑表内嫂","表内嫂"],"w,f,xs,s&l":["姑表小舅弟","表舅仔","表内弟"],"w,f,xs,s&l,w":["姑表内弟妇","表内弟妇"],"w,f,xs,d&o":["姑表大姨姊","表大姨","表内姐"],"w,f,xs,d&o,h":["姑表襟兄","表襟兄"],"w,f,xs,d&l":["姑表小姨妹","表姨仔","表内妹"],"w,f,xs,d&l,h":["姑表襟弟","表襟弟"],"w,m":["岳母","丈母娘","老丈母","丈母","泰水"],"w,m,f":["外祖岳父","外太岳父","姥岳父","姥丈人"],"w,m,f,f":["外曾祖丈人"],"w,m,f,m":["外曾祖丈母"],"w,m,f,ob":["伯外祖岳父"],"w,m,f,ob,w":["伯外祖岳母"],"w,m,f,lb":["叔外祖岳父"],"w,m,f,lb,w":["叔外祖岳母"],"w,m,f,xs":["姑外祖岳母"],"w,m,f,xs,h":["姑外祖岳父"],"w,m,m":["外祖岳母","外太岳母","姥岳母","姥丈母"],"w,m,m,f":["外曾外祖丈人"],"w,m,m,m":["外曾外祖丈母"],"w,m,m,xb":["舅外祖岳父"],"w,m,m,xb,w":["舅外祖岳母"],"w,m,m,xs":["姨外祖岳母"],"w,m,m,xs,h":["姨外祖岳父"],"w,Line truncated

index.html

@@ -11,7 +11,7 @@
 		<meta http-equiv="Cache-Control" content="no-transform" />
 		<meta name="format-detection" content="telephone=no"/>
 		<title>中国亲戚关系计算器</title>
-		<meta name="keywords" content="亲戚称呼,亲戚称谓,亲戚叫法,亲戚关系计算器,亲戚计算器,称呼计算器,親戚關係稱呼">
+		<meta name="keywords" content="家庭称谓,亲戚称呼,亲戚称谓,亲戚叫法,亲戚关系计算器,亲戚计算器,称呼计算器,親戚關係稱呼,亲戚关系大全,叫什么,什么关系">
 		<meta name="description" content="一款最全面精准的中国亲戚关系计算器，走亲访友，逢年过节必备神器。它避免了叫错、不会叫亲戚的尴尬，人人必备家庭教育工具。">
 		<link rel="stylesheet" href="style/index.css">
 		<script type="text/javascript">
@@ -29,7 +29,7 @@
 			<div class="header">
 				<div class="inner">				
 					<div class="mod-head">
-						<div class="bd">						
+						<div class="bd">
 							<a class="btn btn-blue" href="/relationship/vue/" target="_blank">手机版</a>
 							<a class="btn" href="/">返回首页</a>
 						</div>
@@ -42,6 +42,7 @@
 						<div class="hd">
 							<h1>中国亲戚关系计算器</h1>
 							<p>逢年过节遇到三姑六婆，拒绝叫不出口的尴尬！轻松搞定亲戚关系～</p>
+							<p>当前已收录约<b>1400</b>条亲戚关系</p>
 						</div>
 						<div class="bd">
 							<div class="row">
@@ -118,6 +119,10 @@
 							</p>
 						</div>
 						<div class="ft">
+							<div class="intro">
+								<p>由于工作生活节奏不同，如今很多关系稍疏远的亲戚之间来往并不多。因此放假回家过年时，往往会搞不清楚哪位亲戚应该喊什么称呼，很是尴尬。然而搞不清亲戚关系和亲戚称谓的不仅是小孩，就连年轻一代的大人也都常常模糊混乱。</p>
+								<p>“中国亲戚关系计算器”为你避免了这种尴尬，只需简单的输入即可算出称谓。输入框兼容了不同的叫法，你可以称呼父亲为：“老爸”、“爹地”、“老爷子”等等，方面不同地域的习惯叫法。</p>
+							</div>
 							<div class="intro">
 								<h3>使用案例</h3>
 								<p class="q">1. 使用别称查询：</p>

readme.md

@@ -7,7 +7,7 @@
 
 演示地址：[https://passer-by.com/relationship/](http://passer-by.com/relationship/ )
 
-借助这套算法结合react native开发的APP: [https://passer-by.com/relationship/app.html](http://passer-by.com/relationship/app.html)
+借助这套算法结合vue开发的APP: [https://passer-by.com/relationship/vue/](http://passer-by.com/relationship/vue/)
 
 在微信中搜索“亲戚关系”，还可以体验小程序版本
 

script/relationship.js

@@ -166,11 +166,11 @@
 			str:''
 		},
 		{//并列关系处理1
-			exp:/(.+)?\[([^\|]+)\|(.+\|.+)?\](.+)?/g,
+			exp:/(.+)?\[([^\|]+?)\|([^\[\]]+?\|[^\[\]]+?)?\](.+)?/g,
 			str:'$1$2$4#$1[$3]$4'
 		},
 		{//并列关系处理2
-			exp:/(.+)?\[([^\[\]]+)\|([^\[\]]+)?\](.+)?/g,
+			exp:/(.+)?\[([^\[\]\|]+?)\|([^\[\]\|]+?)?\](.+)?/g,
 			str:'$1$2$4#$1$3$4'
 		}
 	];
@@ -187,24 +187,78 @@
 		'[h,f|h,m]':['公婆'],
 		'[w,f|w,m]':['岳父母'],
 		'[xb|xs]':['兄弟姐妹','同胞','手足'],
-		'[s|d]':['子女','儿女','小孩','孩子'],
+		'[f,xb,s&o|f,xb,s&l]':['堂兄弟'],
+		'[f,xb,d&o|f,xb,d&l]':['堂姐妹','堂姊妹'],
+		'[f,xs,s&o|f,xs,s&l|m,xb,s&o|m,xb,s&l]':['表兄弟'],
+		'[f,xs,d&o|f,xs,d&l|m,xb,d&o|m,xb,d&l]':['表姐妹','表姊妹'],
+		'[s|d]':['子女','儿女','小孩','孩子','孩儿'],
 		'[s,s|s,d|d,s|d,d]':['孙辈'],
 		// 本家
 		'f':['爸爸','父亲','阿爸','老爸','老窦','爸','父','爹','爹爹','爹地','爹啲','老爹','大大','老爷子'],
 		// 爷爷
 		'f,f':['爷爷','祖父','阿爷','奶爷','阿公','老爷'],
-		'f,f,f':['曾祖父','太爷','太爷爷','太公','祖公','祖奶爷','太老爷'],
+		'f,f,f':['曾祖父','曾祖','太爷','太爷爷','太公','祖公','祖奶爷','太老爷'],
 		'f,f,f,f':['高祖父','老太奶爷','老太爷','祖太爷','祖太爷爷','祖太公','高王父'],
-		'f,f,f,f,f':['天祖父'],
+		'f,f,f,f,f':['天祖父','高祖'],
-		'f,f,f,f,f,f':['烈祖父'],
+		'f,f,f,f,f,f':['烈祖父','烈祖'],
-		'f,f,f,f,f,m':['烈祖母'],
+		'f,f,f,f,f,f,f':['太祖父','太祖'],
-		'f,f,f,f,f,f,f':['太祖父'],
+		'f,f,f,f,f,f,f,f':['远祖父','远祖'],
-		'f,f,f,f,f,f,m':['太祖母'],
+		'f,f,f,f,f,f,f,f,f':['鼻祖父','鼻祖','始祖'],
-		'f,f,f,f,f,f,f,f':['远祖父'],
+		'f,f,f,f,f,f,f,f,f,ob':['伯鼻祖父'],
-		'f,f,f,f,f,f,f,m':['远祖母'],
+		'f,f,f,f,f,f,f,f,f,ob,w':['伯鼻祖母'],
-		'f,f,f,f,f,f,f,f,f':['鼻祖父'],
+		'f,f,f,f,f,f,f,f,f,lb':['叔鼻祖父'],
+		'f,f,f,f,f,f,f,f,f,lb,w':['叔鼻祖母'],
+		'f,f,f,f,f,f,f,f,f,xs':['姑鼻祖母'],
+		'f,f,f,f,f,f,f,f,f,xs,h':['姑鼻祖父'],
 		'f,f,f,f,f,f,f,f,m':['鼻祖母'],
+		'f,f,f,f,f,f,f,f,m,xs':['姨鼻祖母'],
+		'f,f,f,f,f,f,f,f,m,xs,h':['姨鼻祖父'],
+		'f,f,f,f,f,f,f,f,m,xb':['舅鼻祖父'],
+		'f,f,f,f,f,f,f,f,m,xb,w':['舅鼻祖母'],
+		'f,f,f,f,f,f,f,f,ob':['伯远祖父'],
+		'f,f,f,f,f,f,f,f,ob,w':['伯远祖母'],
+		'f,f,f,f,f,f,f,f,lb':['叔远祖父'],
+		'f,f,f,f,f,f,f,f,lb,w':['叔远祖母'],
+		'f,f,f,f,f,f,f,f,xs':['姑远祖母'],
+		'f,f,f,f,f,f,f,f,xs,h':['姑远祖父'],
+		'f,f,f,f,f,f,f,m':['远祖母'],
+		'f,f,f,f,f,f,f,m,xs':['姨远祖母'],
+		'f,f,f,f,f,f,f,m,xs,h':['姨远祖父'],
+		'f,f,f,f,f,f,f,m,xb':['舅远祖父'],
+		'f,f,f,f,f,f,f,m,xb,w':['舅远祖母'],
+		'f,f,f,f,f,f,f,ob':['伯太祖父'],
+		'f,f,f,f,f,f,f,ob,w':['伯太祖母'],
+		'f,f,f,f,f,f,f,lb':['叔太祖父'],
+		'f,f,f,f,f,f,f,lb,w':['叔太祖母'],
+		'f,f,f,f,f,f,f,xs':['姑太祖母'],
+		'f,f,f,f,f,f,f,xs,h':['姑太祖父'],
+		'f,f,f,f,f,f,m':['太祖母'],
+		'f,f,f,f,f,f,m,xs':['姨太祖母'],
+		'f,f,f,f,f,f,m,xs,h':['姨太祖父'],
+		'f,f,f,f,f,f,m,xb':['舅太祖父'],
+		'f,f,f,f,f,f,m,xb,w':['舅太祖母'],
+		'f,f,f,f,f,f,ob':['伯烈祖父'],
+		'f,f,f,f,f,f,ob,w':['伯烈祖母'],
+		'f,f,f,f,f,f,lb':['叔烈祖父'],
+		'f,f,f,f,f,f,lb,w':['叔烈祖母'],
+		'f,f,f,f,f,f,xs':['姑烈祖母'],
+		'f,f,f,f,f,f,xs,h':['姑烈祖父'],
+		'f,f,f,f,f,m':['烈祖母'],
+		'f,f,f,f,f,m,xs':['姨烈祖母'],
+		'f,f,f,f,f,m,xs,h':['姨烈祖父'],
+		'f,f,f,f,f,m,xb':['舅烈祖父'],
+		'f,f,f,f,f,m,xb,w':['舅烈祖母'],
+		'f,f,f,f,f,ob':['伯天祖父'],
+		'f,f,f,f,f,ob,w':['伯天祖母'],
+		'f,f,f,f,f,lb':['叔天祖父'],
+		'f,f,f,f,f,lb,w':['叔天祖母'],
+		'f,f,f,f,f,xs':['姑天祖母'],
+		'f,f,f,f,f,xs,h':['姑天祖父'],
 		'f,f,f,f,m':['天祖母'],
+		'f,f,f,f,m,xs':['姨天祖母'],
+		'f,f,f,f,m,xs,h':['姨天祖父'],
+		'f,f,f,f,m,xb':['舅天祖父'],
+		'f,f,f,f,m,xb,w':['舅天祖母'],
 		'f,f,f,f,ob':['伯高祖父'],
 		'f,f,f,f,ob,w':['伯高祖母'],
 		'f,f,f,f,lb':['叔高祖父'],
@@ -568,41 +622,53 @@
 		// 从父
 		'f,ob':['伯父','伯伯','阿伯','大伯','大爹','大爸','x伯'],
 		'f,ob,w':['伯母','伯妈','伯娘','大娘','大妈','x妈'],
-		'f,lb':['叔叔','叔父','阿叔','叔爸','叔爹','仲父','小爹','小爸','x叔','叔'],
+		'f,lb':['叔叔','叔父','阿叔','叔爸','叔爹','仲父','小爹','小爸','幺爸','x叔','叔'],
-		'f,lb,w':['婶婶','婶母','婶娘','婶爹','婶妈','婶子','家婶','叔母','阿婶','叔妈','叔娘','季母','小娘','小妈','x婶','婶'],
+		'f,lb,w':['婶婶','婶母','婶娘','婶爹','婶妈','婶子','家婶','叔母','阿婶','叔妈','叔娘','季母','小娘','小妈','幺婶','x婶','婶'],
-		'f,xb,w,f':['叔姻外祖父','姻伯公'],
+		'f,xb,w,f':['叔姻外祖父','叔眷毑父','眷爷爷'],
-		'f,xb,w,m':['叔姻外祖母','姻伯婆'],
+		'f,xb,w,m':['叔姻外祖母','叔眷毑母','眷姥姥'],
 		'f,xb,w,xb':['叔姻舅父','姻舅父'],
 		'f,xb,w,xb,w':['叔姻舅母','姻舅母'],
 		'f,xb,w,xs':['叔姻姨母','姻姨母'],
 		'f,xb,w,xs,h':['叔姻姨父','姻姨父'],
 		'f,xb,s&o':['堂哥','堂兄','堂阿哥','从父兄','叔伯兄','从兄'],
-		'f,xb,s&o,w':['堂嫂'],
+		'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':['堂侄','堂侄男','堂侄子','从父侄男','叔伯侄男'],
-		'f,xb,s,s,w':['堂侄妇','从父侄妇','叔伯侄父'],
+		'f,xb,s,s,w':['堂侄媳妇','堂侄妇','从父侄妇','叔伯侄父'],
 		'f,xb,s,s,s':['堂侄孙男'],
 		'f,xb,s,s,s,w':['堂侄孙妇'],
 		'f,xb,s,s,d':['堂侄孙女'],
 		'f,xb,s,s,d,h':['堂侄孙婿'],
 		'f,xb,s,d':['堂侄女','从父侄女','叔伯侄女','堂侄'],
-		'f,xb,s,d,h':['堂侄婿','从父侄婿','叔伯侄婿'],
+		'f,xb,s,d,h':['堂侄女婿','堂侄婿','从父侄婿','叔伯侄婿'],
+		'f,xb,s,d,s':['堂侄外孙男'],
+		'f,xb,s,d,s,w':['堂侄外孙妇'],
+		'f,xb,s,d,d':['堂侄外孙女'],
+		'f,xb,s,d,d,h':['堂侄外孙婿'],
 		'f,xb,d&o':['堂姐','堂姊','堂阿姐','从父姊','叔伯姊','从姊'],
-		'f,xb,d&o,h':['堂姐夫'],
+		'f,xb,d&o,h':['堂姐夫','从父姊夫','从父姊婿','叔伯姊夫'],
 		'f,xb,d&l':['堂妹','堂阿妹','从父妹','叔伯妹','从妹'],
-		'f,xb,d&l,h':['堂妹夫'],
+		'f,xb,d&l,h':['堂妹夫','从父妹夫','从父妹婿','叔伯妹夫'],
 		'f,xb,d,s':['堂甥男','堂甥'],
 		'f,xb,d,s,w':['堂甥妇'],
+		'f,xb,d,s,s':['堂甥孙男'],
+		'f,xb,d,s,s,w':['堂甥孙妇'],
+		'f,xb,d,s,d':['堂甥孙女'],
+		'f,xb,d,s,d,h':['堂甥孙婿'],
 		'f,xb,d,d':['堂甥女','堂甥'],
 		'f,xb,d,d,h':['堂甥婿'],
+		'f,xb,d,d,s':['堂甥外孙男'],
+		'f,xb,d,d,s,w':['堂甥外孙妇'],
+		'f,xb,d,d,d':['堂甥外孙女'],
+		'f,xb,d,d,d,h':['堂甥外孙婿'],
 		// 姑表
 		'f,os':['姑妈','姑母'],
 		'f,ls':['姑妈','姑姐'],
 		'f,xs':['姑妈','姑姑','姑娘','大姑妈','姑','x姑妈'],
 		'f,xs,h':['姑丈','姑父','姑爸','姑夫','x姑丈','x姑父'],
-		'f,xs,h,f':['姑姻伯公','姻伯公'],
+		'f,xs,h,f':['姑姻祖父','姻爷爷'],
-		'f,xs,h,m':['姑姻伯婆','姻伯婆'],
+		'f,xs,h,m':['姑姻祖母','姻奶奶'],
 		'f,xs,h,ob':['姑姻伯父','姻伯父','姻世伯'],
 		'f,xs,h,ob,w':['姑姻伯母','姻伯母'],
 		'f,xs,h,lb':['姑姻叔父','姻叔父'],
@@ -610,9 +676,9 @@
 		'f,xs,h,xs':['姑姻姑母','姻姑母'],
 		'f,xs,h,xs,h':['姑姻姑父','姻姑父'],
 		'f,xs,s&o':['姑表哥','姑表兄','表哥','表兄'],
-		'f,xs,s&o,w':['姑表嫂','表嫂'],
+		'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,w':['姑表侄妇','表侄妇'],
 		'f,xs,s,s,s':['姑表侄孙男','姑表侄孙','表侄孙'],
@@ -621,20 +687,26 @@
 		'f,xs,s,s,d,h':['姑表侄孙婿','表侄孙婿'],
 		'f,xs,s,d':['姑表侄女','表侄女','表侄'],
 		'f,xs,s,d,h':['姑表侄婿','表侄婿'],
-		'f,xs,s,d,s':['姑表侄孙'],
+		'f,xs,s,d,s':['姑表侄外孙男'],
-		'f,xs,s,d,s,w':['姑表侄孙妇'],
+		'f,xs,s,d,s,w':['姑表侄外孙妇'],
-		'f,xs,s,d,d':['姑表侄孙女'],
+		'f,xs,s,d,d':['姑表侄外孙女'],
-		'f,xs,s,d,d,h':['姑表侄孙婿'],
+		'f,xs,s,d,d,h':['姑表侄外孙婿'],
 		'f,xs,d&o':['姑表姐','姑表姊','表姐','表姊'],
-		'f,xs,d&o,h':['姑表姐夫','姑表姊夫','表姐夫','表姊夫','表姐丈','表姊丈'],
+		'f,xs,d&o,h':['姑表姐夫','姑表姊夫','姑表姊婿','表姐夫','表姊夫','表姐丈','表姊丈'],
 		'f,xs,d&l':['姑表妹','表妹'],
-		'f,xs,d&l,h':['姑表妹夫','表妹夫'],
+		'f,xs,d&l,h':['姑表妹夫','姑表妹婿','表妹夫'],
 		'f,xs,d,s':['姑表甥男','表甥男','表外甥'],
+		'f,xs,d,s,w':['姑表甥妇'],
 		'f,xs,d,s,s':['姑表甥孙男','表甥孙男'],
+		'f,xs,d,s,s,w':['姑表甥孙妇','表甥孙妇'],
 		'f,xs,d,s,d':['姑表甥孙女','表甥孙女'],
+		'f,xs,d,s,d,h':['姑表甥孙婿','表甥孙婿'],
 		'f,xs,d,d':['姑表甥女','表甥女','表外甥'],
+		'f,xs,d,d,h':['姑表甥婿'],
 		'f,xs,d,d,s':['姑表甥外孙男','表甥外孙男'],
+		'f,xs,d,d,s,w':['姑表甥外孙妇','表甥外孙妇'],
 		'f,xs,d,d,d':['姑表甥外孙女','表甥外孙女'],
+		'f,xs,d,d,d,h':['姑表甥外孙婿','表甥外孙婿'],
 		// 外家
 		'm':['妈妈','母亲','老妈','阿妈','老母','老妈子','妈','母','娘','娘亲','妈咪'],
 		// 外公
@@ -648,12 +720,12 @@
 		'm,f,f,lb':['叔外曾祖父','外太叔公','叔太姥爷','叔太奶爷','叔太爷爷'],
 		'm,f,f,lb,w':['叔外曾祖母','外太叔母','叔太姥姥','叔太奶奶'],
 		// 再从父
-		'm,f,f,xb,s':['从父外祖父','从父姥爷'],
+		'm,f,f,xb,s':['堂外祖父','从父外祖父','从父姥爷'],
-		'm,f,f,xb,s,w':['从父外祖母','从父姥姥'],
+		'm,f,f,xb,s,w':['堂外祖母','从父外祖母','从父姥姥'],
-		'm,f,f,xb,s&o':['从父伯外祖父','从父伯姥爷'],
+		'm,f,f,xb,s&o':['堂伯外祖父','从父伯外祖父','从父伯姥爷'],
-		'm,f,f,xb,s&o,w':['从父伯外祖母','从父伯姥姥'],
+		'm,f,f,xb,s&o,w':['堂伯外祖母','从父伯外祖母','从父伯姥姥'],
-		'm,f,f,xb,s&l':['从父叔外祖父','从父叔姥爷'],
+		'm,f,f,xb,s&l':['堂叔外祖父','从父叔外祖父','从父叔姥爷'],
-		'm,f,f,xb,s&l,w':['从父叔外祖母','从父叔姥姥'],
+		'm,f,f,xb,s&l,w':['堂叔外祖母','从父叔外祖母','从父叔姥姥'],
 		'm,f,f,xb,s,s':['再从父舅父'],
 		'm,f,f,xb,s,s,w':['再从父舅母'],
 		'm,f,f,xb,s,d':['再从父姨母'],
@@ -726,8 +798,10 @@
 		'm,f,m,xs,d,d':['从母姑表姨母'],
 		'm,f,m,xs,d,d,h':['从母姑表姨父'],
 		// 从父*
-		'm,f,ob':['大外公','大姥爷','x外公','x姥爷'],
+		'm,f,ob':['外伯公','伯外祖父','外伯祖父','伯姥爷','外伯祖','大外公','大姥爷','x外公','x姥爷'],
-		'm,f,lb':['小外公','小姥爷','x外公','x姥爷'],
+		'm,f,ob,w':['外伯婆','伯外祖母','外伯祖母','伯姥姥','大姥姥','外姆婆','小外公','小姥爷','x外公','x姥爷'],
+		'm,f,lb':['外叔公','叔外祖父','外叔祖父','叔姥爷','外叔祖','叔外祖'],
+		'm,f,lb,w':['外叔婆','叔外祖母','外叔祖母','叔姥姥','小姥姥','外姆婆'],
 		// 从父舅表
 		'm,f,xb,s':['堂舅','堂舅爸','堂舅父','堂舅舅','从父舅父','叔伯舅父','叔伯舅'],
 		'm,f,xb,s,w':['堂舅妈','堂舅母','从父舅母','叔伯舅母'],
@@ -758,10 +832,6 @@
 		'm,f,xb,d,d,s,w':['从父舅表甥妇'],
 		'm,f,xb,d,d,d':['从父舅表甥女'],
 		'm,f,xb,d,d,d,h':['从父舅表甥婿'],
-		'm,f,ob':['外伯公','伯外祖父','外伯祖父','伯姥爷','大姥爷','外伯祖'],
-		'm,f,ob,w':['外伯婆','伯外祖母','外伯祖母','伯姥姥','大姥姥','外姆婆'],
-		'm,f,lb':['外叔公','叔外祖父','外叔祖父','叔姥爷','小姥爷','外叔祖','叔外祖'],
-		'm,f,lb,w':['外叔婆','叔外祖母','外叔祖母','叔姥姥','小姥姥','外姆婆'],
 		// 姑表*
 		'm,f,xs':['外姑婆','姑姥姥','姑外祖母','外姑祖母','外太姑母','外姑母'],
 		'm,f,xs,h':['外姑公','姑姥爷','姑外祖父','外姑祖父','外太姑父','外姑丈'],
@@ -945,17 +1015,17 @@
 		'm,m,xs,d,d,d,h':['再从母甥婿'],
 		// 舅表
 		'm,xb':['舅舅','舅父','舅','娘舅','舅仔','母舅','舅爸','舅爹','阿舅','x舅'],
-		'm,xb,w':['舅妈','舅母','妗子','妗妗','妗母','阿妗','x舅妈'],
+		'm,xb,w':['舅妈','舅母','妗子','妗妗','妗妈','妗母','阿妗','x舅妈'],
-		'm,xb,w,f':['舅姻外祖父','姻伯公'],
+		'm,xb,w,f':['舅姻外祖父','舅眷毑父','眷爷爷'],
-		'm,xb,w,m':['舅姻外祖母','姻伯婆'],
+		'm,xb,w,m':['舅姻外祖母','舅眷毑母','眷姥姥'],
 		'm,xb,w,xb':['舅姻舅父','姻舅父'],
 		'm,xb,w,xb,w':['舅姻舅母','姻舅母'],
 		'm,xb,w,xs':['舅姻姨母','姻姨母'],
 		'm,xb,w,xs,h':['舅姻姨父','姻姨父'],
 		'm,xb,s&o':['舅表哥','舅表兄','表哥','表兄'],
-		'm,xb,s&o,w':['舅表嫂','表嫂'],
+		'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,w':['舅表侄妇','表侄妇'],
 		'm,xb,s,s,s':['舅表侄孙男','舅表侄孙','表侄孙'],
@@ -964,18 +1034,20 @@
 		'm,xb,s,s,d,h':['舅表侄孙婿','表侄孙婿'],
 		'm,xb,s,d':['舅表侄女','表侄女','表侄'],
 		'm,xb,s,d,h':['舅表侄婿','表侄婿'],	
-		'm,xb,s,d,s':['舅表侄孙'],
+		'm,xb,s,d,s':['舅表侄外孙男'],
-		'm,xb,s,d,s,w':['舅表侄孙妇'],
+		'm,xb,s,d,s,w':['舅表侄外孙妇'],
-		'm,xb,s,d,d':['舅表侄孙女'],
+		'm,xb,s,d,d':['舅表侄外孙女'],
-		'm,xb,s,d,d,h':['舅表侄孙婿'],
+		'm,xb,s,d,d,h':['舅表侄外孙婿'],
 		'm,xb,d&o':['舅表姐','舅表姊','表姐','表姊'],
-		'm,xb,d&o,h':['舅表姐夫','舅表姊夫','表姐夫','表姐姊','表姐丈','表姊丈'],
+		'm,xb,d&o,h':['舅表姐夫','舅表姊夫','舅表姊婿','表姐夫','表姐姊','表姐丈','表姊丈'],
 		'm,xb,d&l':['舅表妹','表妹'],
-		'm,xb,d&l,h':['舅表妹夫','表妹夫'],
+		'm,xb,d&l,h':['舅表妹夫','舅表妹婿','表妹夫'],
 		'm,xb,d,s':['舅表甥男','表外甥','表甥男'],
+		'm,xb,d,s,w':['舅表甥妇'],
 		'm,xb,d,s,s':['舅表甥孙男','表甥孙男'],
 		'm,xb,d,s,d':['舅表甥孙女','表甥孙女'],
 		'm,xb,d,d':['舅表甥女','表外甥','表甥女'],
+		'm,xb,d,d,h':['舅表甥婿'],
 		'm,xb,d,d,s':['舅表甥外孙男','表甥外孙男'],
 		'm,xb,d,d,d':['舅表甥外孙女','表甥外孙女'],
 		'm,ob':['大舅'],
@@ -988,9 +1060,9 @@
 		'm,ls':['小姨','小姨妈','姨仔'],
 		'm,ls,h':['小姨父','小姨丈'],
 		'm,xs':['姨妈','姨母','姨姨','姨娘','阿姨','姨','x姨','x姨妈'],
-		'm,xs,h':['姨丈','姨父','姨爸','姨爹','x姨丈','x姨父'],
+		'm,xs,h':['姨丈','姨父','姨爸','姨爹','姨婿','姨郎','x姨丈','x姨父'],
-		'm,xs,h,f':['姨姻祖父','姻伯公'],
+		'm,xs,h,f':['姨姻祖父','姻爷爷'],
-		'm,xs,h,m':['姨姻祖母','姻伯婆'],
+		'm,xs,h,m':['姨姻祖母','姻奶奶'],
 		'm,xs,h,ob':['姨姻伯父','姻伯父','姻世伯'],
 		'm,xs,h,ob,w':['姨姻伯母','姻伯母'],
 		'm,xs,h,lb':['姨姻叔父','姻叔父'],
@@ -1003,16 +1075,32 @@
 		'm,xs,s&l,w':['姨弟妇','从母弟妇'],
 		'm,xs,s,s':['姨侄男','从母侄男','姨侄'],
 		'm,xs,s,s,w':['姨侄妇','从母侄妇'],
+		'm,xs,s,s,s':['姨侄孙男','姨侄孙'],
+		'm,xs,s,s,s,w':['姨侄孙妇'],
+		'm,xs,s,s,d':['姨侄孙女'],
+		'm,xs,s,s,d,h':['姨侄孙婿'],
 		'm,xs,s,d':['姨侄女','从母侄女','姨侄'],
 		'm,xs,s,d,h':['姨侄婿','从母侄婿'],
+		'm,xs,s,d,s':['姨侄外孙男','姨侄外孙'],
+		'm,xs,s,d,s,w':['姨侄外孙妇'],
+		'm,xs,s,d,d':['姨侄外孙女'],
+		'm,xs,s,d,d,h':['姨侄外孙婿'],
 		'm,xs,d&o':['姨姐','姨姊','从母姐','从母姊'],
-		'm,xs,d&o,h':['姨姐夫','从母姐夫','从母姊夫','从母姊丈','从母姊婿','从母姊郎'],
+		'm,xs,d&o,h':['姨姐夫','姨姊夫','从母姐夫','从母姊夫','从母姊丈','从母姊婿','从母姊郎'],
 		'm,xs,d&l':['姨妹','从母妹'],
 		'm,xs,d&l,h':['姨妹夫','从母妹夫','从母妹丈','从母妹婿','从母妹郎'],
-		'm,xs,d,s':['姨甥男','从母甥男','姨甥'],
+		'm,xs,d,s':['姨甥男','从母甥男','姨外甥','姨甥'],
 		'm,xs,d,s,w':['姨甥妇','从母甥妇'],
-		'm,xs,d,d':['姨甥女','从母甥女','姨甥'],
+		'm,xs,d,s,s':['姨甥孙男','姨甥孙'],
+		'm,xs,d,s,s,w':['姨甥孙妇'],
+		'm,xs,d,s,d':['姨甥孙女'],
+		'm,xs,d,s,d,h':['姨甥孙婿'],
+		'm,xs,d,d':['姨甥女','从母甥女','姨外甥女','姨甥'],
 		'm,xs,d,d,h':['姨甥婿','从母甥婿'],
+		'm,xs,d,d,s':['姨甥外孙男','姨甥外孙'],
+		'm,xs,d,d,s,w':['姨甥外孙妇'],
+		'm,xs,d,d,d':['姨甥外孙女'],
+		'm,xs,d,d,d,h':['姨甥外孙婿'],
 		// 婆家
 		'h':['老公','丈夫','先生','官人','男人','汉子','夫','夫君','相公','夫婿','良人','爱人','老伴','老头子'],
 		'h,f':['公公','翁亲','老公公'],
@@ -1022,10 +1110,10 @@
 		'h,f,f,lb':['叔祖公','叔祖翁'],
 		'h,f,f,lb,w':['叔祖婆'],
 		'h,f,f,f':['曾祖公','太公翁'],
-		'h,f,f,f,ob':['太伯翁'],
+		'h,f,f,f,ob':['伯曾祖公','太伯翁'],
-		'h,f,f,f,ob,w':['太姆婆'],
+		'h,f,f,f,ob,w':['伯曾祖婆','太姆婆'],
-		'h,f,f,f,lb':['太叔翁'],
+		'h,f,f,f,lb':['叔曾祖公','太叔翁'],
-		'h,f,f,f,lb,w':['太婶婆'],
+		'h,f,f,f,lb,w':['叔曾祖婆','太婶婆'],
 		'h,f,f,m':['曾祖婆','太奶亲'],
 		'h,f,f,xs':['姑祖婆'],
 		'h,f,f,xs,h':['姑祖公'],
@@ -1040,34 +1128,34 @@
 		'h,f,ob,w':['伯婆母','伯婆'],
 		'h,f,lb':['叔公父','叔公','叔翁','叔祖'],
 		'h,f,lb,w':['叔婆母','叔婆','婶婆','婶亲'],
-		'h,f,xb,s&o':['堂大伯子','从父大伯子','堂大伯','从父大伯','夫从兄'],
+		'h,f,xb,s&o':['堂大伯子','从父大伯子','从父大伯兄','堂大伯','从父大伯','夫从兄'],
 		'h,f,xb,s&o,w':['堂大伯嫂','从父大伯嫂','堂大姆','从父大姆','从兄嫂'],
 		'h,f,xb,s&l':['堂小叔弟','从父小叔弟','堂叔仔','从父叔仔','夫从弟'],
 		'h,f,xb,s&l,w':['堂小叔弟妇','从父小叔弟妇','堂小弟','从父小弟','从弟妇'],
 		'h,f,xb,s,s':['堂夫侄男','从父夫侄男'],
 		'h,f,xb,s,d':['堂夫侄女','从父夫侄女'],
-		'h,f,xb,d&o':['堂大姑姐','从父大姑姐'],
+		'h,f,xb,d&o':['堂大姑姐','从父大姑姐','从父大姑姊'],
-		'h,f,xb,d&o,h':['堂大姑姐夫','从父大姑姐夫'],
+		'h,f,xb,d&o,h':['堂大姑姐夫','从父大姑姐夫','从父大姑姊夫'],
 		'h,f,xb,d&l':['堂小姑妹','从父小姑妹'],
 		'h,f,xb,d&l,h':['堂小姑妹夫','从父小姑妹夫'],
 		'h,f,xb,d,s':['堂夫甥男','从父夫甥男'],
 		'h,f,xb,d,d':['堂夫甥女','从父夫甥女'],
 		'h,f,xs':['姑婆母','姑婆'],
 		'h,f,xs,h':['姑公父','姑公'],
-		'h,f,xs,s&o':['姑表大伯子','表大伯'],
+		'h,f,xs,s&o':['姑表大伯子','姑表大伯兄','表大伯'],
 		'h,f,xs,s&o,w':['姑表大伯嫂','表大姆'],
 		'h,f,xs,s&l':['姑表小叔弟','表叔仔'],
 		'h,f,xs,s&l,w':['姑表小叔弟妇','表小弟'],
 		'h,f,xs,s,s':['姑表夫侄男'],
 		'h,f,xs,s,d':['姑表夫侄女'],
-		'h,f,xs,d&o':['姑表大姑姐','表大姑'],
+		'h,f,xs,d&o':['姑表大姑姐','姑表大姑姊','表大姑'],
-		'h,f,xs,d&o,h':['姑表大姑姐夫'],
+		'h,f,xs,d&o,h':['姑表大姑姐夫','姑表大姑姊夫'],
 		'h,f,xs,d&l':['姑表小姑妹','表姑仔'],
 		'h,f,xs,d&l,h':['姑表小姑妹夫'],
 		'h,f,xs,d,s':['姑表夫甥男'],
 		'h,f,xs,d,d':['姑表夫甥女'],
 		'h,m':['婆婆','婆母','姑亲','老婆婆'],
-		'h,m,f':['外祖公','姥公父'],
+		'h,m,f':['外祖公','姥公父','姥公'],
 		'h,m,f,f':['外曾祖公'],
 		'h,m,f,m':['外曾祖婆'],
 		'h,m,f,ob':['伯外祖公'],
@@ -1076,7 +1164,7 @@
 		'h,m,f,lb,w':['叔外祖婆'],
 		'h,m,f,xs':['姑外祖婆'],
 		'h,m,f,xs,h':['姑外祖公'],
-		'h,m,m':['外祖婆','姥婆母'],
+		'h,m,m':['外祖婆','姥婆母','姥婆'],
 		'h,m,m,f':['外曾外祖公'],
 		'h,m,m,m':['外曾外祖婆'],
 		'h,m,m,xb':['舅外祖公'],
@@ -1085,28 +1173,28 @@
 		'h,m,m,xs,h':['姨外祖公'],
 		'h,m,xb':['舅公父','舅公'],
 		'h,m,xb,w':['舅婆母','舅婆'],
-		'h,m,xb,s&o':['舅表大伯子','表大伯'],
+		'h,m,xb,s&o':['舅表大伯子','舅表大伯兄','表大伯'],
 		'h,m,xb,s&o,w':['舅表大伯嫂','表大姆'],
 		'h,m,xb,s&l':['舅表小叔弟','表叔仔'],
 		'h,m,xb,s&l,w':['舅表小叔弟妇','表小弟'],
 		'h,m,xb,s,s':['舅表夫侄男'],
 		'h,m,xb,s,d':['舅表夫侄女'],
-		'h,m,xb,d&o':['舅表大姑姐','表大姑'],
+		'h,m,xb,d&o':['舅表大姑姐','舅表大姑姊','表大姑'],
-		'h,m,xb,d&o,h':['舅表大姑姐夫'],
+		'h,m,xb,d&o,h':['舅表大姑姐夫','舅表大姑姊夫'],
 		'h,m,xb,d&l':['舅表小姑妹','表姑仔'],
 		'h,m,xb,d&l,h':['舅表小姑妹夫'],
 		'h,m,xb,d,s':['舅表夫甥男'],
 		'h,m,xb,d,d':['舅表夫甥女'],
 		'h,m,xs':['姨婆母','姨婆'],
 		'h,m,xs,h':['姨公父','姨公'],
-		'h,m,xs,s&o':['姨大伯子','从母大伯子','姨大伯','从母大伯'],
+		'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,m,xs,d&o,h':['姨大姑姐夫','从母大姑姐夫'],
+		'h,m,xs,d&o,h':['姨大姑姐夫','从母大姑姊夫','从母大姑姐夫'],
 		'h,m,xs,d&l':['姨小姑妹','从母小姑妹'],
 		'h,m,xs,d&l,h':['姨小姑妹夫','从母小姑妹夫'],
 		'h,m,xs,d,s':['姨夫甥男','从母夫甥男'],
@@ -1116,8 +1204,8 @@
 		'h,lb':['小叔子','小叔弟'],
 		'h,lb,w':['小婶子','叔嫂','小叔妇','小叔媳妇','小叔弟妇','妯娌'],
 		'h,xb':['伯叔'],
-		'h,xb,s':['叔侄男','叔伯男','从男','婆家侄男'],
+		'h,xb,s':['婆家侄','叔侄男','叔伯男','从男','婆家侄男'],
-		'h,xb,s,w':['叔侄妇'],
+		'h,xb,s,w':['叔侄媳妇','叔伯侄妇','叔伯妇','叔侄妇'],
 		'h,xb,s,s':['叔侄孙男'],
 		'h,xb,s,s,w':['叔侄孙妇'],
 		'h,xb,s,d':['叔侄孙女'],
@@ -1133,7 +1221,7 @@
 		'h,ls':['小姑子','小姑','小姑妹','姑仔','夫妹'],
 		'h,ls,h':['小姑夫','小亘子','小姑妹夫'],
 		'h,xs,s':['姑甥男','姑男','婆家甥男'],
-		'h,xs,s,w':['姑甥妇'],
+		'h,xs,s,w':['姑甥妇','姑妇'],
 		'h,xs,s,s':['姑甥孙男'],
 		'h,xs,s,s,w':['姑甥孙妇'],
 		'h,xs,s,d':['姑甥孙女'],
@@ -1193,8 +1281,8 @@
 		'w,f,xs,d&o,h':['姑表襟兄','表襟兄'],
 		'w,f,xs,d&l':['姑表小姨妹','表姨仔','表内妹'],
 		'w,f,xs,d&l,h':['姑表襟弟','表襟弟'],
-		'w,m':['岳母','丈母娘','丈母','泰水'],
+		'w,m':['岳母','丈母娘','老丈母','丈母','泰水'],
-		'w,m,f':['外祖岳父','外太岳父','姥岳父'],
+		'w,m,f':['外祖岳父','外太岳父','姥岳父','姥丈人'],
 		'w,m,f,f':['外曾祖丈人'],
 		'w,m,f,m':['外曾祖丈母'],
 		'w,m,f,ob':['伯外祖岳父'],
@@ -1203,7 +1291,7 @@
 		'w,m,f,lb,w':['叔外祖岳母'],
 		'w,m,f,xs':['姑外祖岳母'],
 		'w,m,f,xs,h':['姑外祖岳父'],
-		'w,m,m':['外祖岳母','外太岳母','姥岳母'],
+		'w,m,m':['外祖岳母','外太岳母','姥岳母','姥丈母'],
 		'w,m,m,f':['外曾外祖丈人'],
 		'w,m,m,m':['外曾外祖丈母'],
 		'w,m,m,xb':['舅外祖岳父'],
@@ -1234,15 +1322,19 @@
 		'w,ob,w':['舅嫂','大舅妇','大舅嫂','大舅媳妇','大妗子','内嫂','妻兄嫂'],
 		'w,lb':['小舅子','小舅弟','内弟','妻弟','妻舅','舅弟'],
 		'w,lb,w':['舅弟媳','小舅妇','小舅弟妇','小舅媳妇','小妗子','妻妹夫'],
-		'w,xb,s':['内侄男','内侄','妻侄男','舅侄男','岳侄男','丈人侄男','舅男'],
+		'w,xb,s':['内侄','内侄男','妻侄男','舅侄男','岳侄男','丈人侄男','舅男'],
-		'w,xb,s,w':['内侄妇','内侄媳妇','妻侄妇','舅侄妇','岳侄妇','丈人侄妇'],
+		'w,xb,s,w':['内侄妇','内侄媳妇','妻侄妇','舅侄妇','岳侄妇','丈人侄妇','舅妇'],
-		'w,xb,s,s':['内侄孙男','妻侄孙男'],
+		'w,xb,s,s':['内侄孙','内侄孙男','妻侄孙男'],
 		'w,xb,s,s,w':['内侄孙妇','妻侄孙妇'],
+		'w,xb,s,s,s':['内曾侄孙','内曾侄孙男'],
+		'w,xb,s,s,s,w':['内曾侄孙妇'],
+		'w,xb,s,s,d':['内曾侄孙女'],
+		'w,xb,s,s,d,h':['内曾侄孙婿'],
 		'w,xb,s,d':['内侄孙女','妻侄孙女'],
 		'w,xb,s,d,h':['内侄孙婿','妻侄孙婿'],
 		'w,xb,d':['内侄女','内侄','妻侄女','舅侄女','岳侄女','丈人侄女','舅女'],
 		'w,xb,d,h':['内侄婿','妻侄婿','舅侄婿','岳侄婿','丈人侄婿'],
-		'w,xb,d,s':['内侄外孙男','姨侄外孙男'],
+		'w,xb,d,s':['内侄外孙','内侄外孙男','姨侄外孙男'],
 		'w,xb,d,s,w':['内侄外孙妇','姨侄外孙妇'],
 		'w,xb,d,d':['内侄外孙女','姨侄外孙女'],
 		'w,xb,d,d,h':['内侄外孙婿','姨侄外孙婿'],
@@ -1251,7 +1343,7 @@
 		'w,ls':['小姨子','小姨妹','妻妹','小妹儿'],
 		'w,ls,h':['小姨夫','小姨妹夫','襟弟','连襟','连桥','姨夫'],
 		'w,xs,s':['内甥男','内甥','妻甥男','姨甥男','岳甥男','丈人甥男','姨男','从男'],
-		'w,xs,s,w':['内甥妇','姨甥妇','姨甥妇','岳甥妇','丈人甥妇'],
+		'w,xs,s,w':['内甥妇','姨甥妇','岳甥妇','丈人甥妇','姨妇'],
 		'w,xs,s,s':['内甥孙男','姨甥孙男'],
 		'w,xs,s,s,w':['内甥孙妇','姨甥孙妇'],
 		'w,xs,s,d':['内甥孙女','姨甥孙女'],
@@ -1399,8 +1491,8 @@
 		'0,xs,h,xs,d':['姨姻姑女'],
 		'1,xs,h,xs,d':['姑姻姑女'],
 		'xs,s':['外甥','外甥男','甥男','甥儿','甥子','外甥儿','外甥子','外甥儿子'],
-		'xs,s,w':['甥媳妇','外甥媳妇','甥妇'],
+		'xs,s,w':['外甥媳妇','甥媳妇','甥妇'],
-		'xs,s,s':['甥孙男'],
+		'xs,s,s':['甥孙'],
 		'xs,s,s,w':['甥孙妇'],
 		'xs,s,s,s':['甥曾孙'],
 		'xs,s,s,s,w':['甥曾孙妇'],
@@ -1421,7 +1513,7 @@
 		'xs,s,d,d,s':['甥曾外曾外孙'],
 		'xs,s,d,d,d':['甥曾外曾外孙女'],
 		'xs,d':['外甥女','甥女','外甥囡'],
-		'xs,d,h':['甥女婿','外甥女婿','甥婿'],
+		'xs,d,h':['外甥女婿','甥女婿','甥婿'],
 		'xs,d,s':['甥外孙'],
 		'xs,d,s,w':['甥外孙妇'],
 		'xs,d,s,s':['甥外曾孙'],
@@ -1443,56 +1535,89 @@
 		'xs,d,d,d,s':['甥外曾外曾外孙'],
 		'xs,d,d,d,d':['甥外曾外曾外孙女'],
 		//自家
-		's':['儿子','男儿','仔','阿仔','仔仔','x儿子','孩子','孩儿'],
+		's':['儿子','男儿','儿','仔','阿仔','仔仔','x儿子'],
 		's,w':['儿媳','儿媳妇','新妇'],
 		's,s':['孙子','孙男','孙儿','x孙子','孙'],
-		's,s,w':['孙媳','孙媳妇','孙妇'],
+		's,s,w':['孙媳妇','孙媳','孙妇'],
 		's,s,w,xb':['姻家再侄'],
 		's,s,w,xs':['姻家再侄'],
-		's,s,s':['曾孙','曾孙男'],
+		's,s,s':['曾孙','曾孙男','重孙'],
 		's,s,s,w':['曾孙妇'],
 		's,s,s,s':['玄孙','元孙','膀孙'],
-		's,s,s,d':['玄孙女'],
+		's,s,s,s,w':['玄孙媳妇'],
 		's,s,s,s,s':['来孙'],
-		's,s,s,s,d':['来孙女'],
+		's,s,s,s,s,w':['来孙媳妇'],
 		's,s,s,s,s,s':['晜孙'],
-		's,s,s,s,s,d':['晜孙女'],
+		's,s,s,s,s,s,w':['晜孙媳妇'],
 		's,s,s,s,s,s,s':['仍孙'],
-		's,s,s,s,s,s,d':['仍孙女'],
+		's,s,s,s,s,s,s,w':['仍孙媳妇'],
 		's,s,s,s,s,s,s,s':['云孙'],
-		's,s,s,s,s,s,s,d':['云孙女'],
 		's,s,s,s,s,s,s,s,s':['耳孙'],
+		's,s,s,s,s,s,s,s,s,w':['耳孙媳妇'],
 		's,s,s,s,s,s,s,s,d':['耳孙女'],
-		's,s,d':['曾孙女','曾孙'],
+		's,s,s,s,s,s,s,s,d,h':['耳孙女婿'],
+		's,s,s,s,s,s,s,d':['云孙女'],
+		's,s,s,s,s,s,s,d,h':['云孙女婿'],
+		's,s,s,s,s,s,s,d,s':['耳外孙'],
+		's,s,s,s,s,s,s,d,s,w':['耳外孙媳妇'],
+		's,s,s,s,s,s,s,d,d':['耳外孙女'],
+		's,s,s,s,s,s,s,d,d,h':['耳外孙女婿'],
+		's,s,s,s,s,s,d':['仍孙女'],
+		's,s,s,s,s,s,d,h':['仍孙女婿'],
+		's,s,s,s,s,s,d,s':['云外孙'],
+		's,s,s,s,s,s,d,s,w':['云外孙媳妇'],
+		's,s,s,s,s,s,d,d':['云外孙女'],
+		's,s,s,s,s,s,d,d,h':['云外孙女婿'],
+		's,s,s,s,s,d':['晜孙女'],
+		's,s,s,s,s,d,h':['晜孙女婿'],
+		's,s,s,s,s,d,s':['仍外孙'],
+		's,s,s,s,s,d,s,w':['仍外孙媳妇'],
+		's,s,s,s,s,d,d':['仍外孙女'],
+		's,s,s,s,s,d,d,h':['仍外孙女婿'],
+		's,s,s,s,d':['来孙女'],
+		's,s,s,s,d,h':['来孙女婿'],
+		's,s,s,s,d,s':['晜外孙'],
+		's,s,s,s,d,s,w':['晜外孙媳妇'],
+		's,s,s,s,d,d':['晜外孙女'],
+		's,s,s,s,d,d,h':['晜外孙女婿'],
+		's,s,s,d':['玄孙女'],
+		's,s,s,d,h':['玄孙女婿'],
+		's,s,s,d,s':['来外孙'],
+		's,s,s,d,s,w':['来外孙媳妇'],
+		's,s,s,d,d':['来外孙女'],
+		's,s,s,d,d,h':['来外孙女婿'],
+		's,s,d':['曾孙女'],
 		's,s,d,h':['曾孙婿'],
-		's,s,d,s':['玄外孙',],
+		's,s,d,s':['玄外孙'],
+		's,s,d,s,w':['玄外孙媳妇'],
 		's,s,d,d':['玄外孙女'],
+		's,s,d,d,h':['玄外孙女婿'],
 		's,d':['孙女','孙囡'],
-		's,d,h':['孙婿','孙女婿'],
+		's,d,h':['孙女婿','孙婿'],
 		's,d,h,xb':['姻家再侄男','姻家再侄'],
 		's,d,h,xs':['姻家再侄女','姻家再侄'],
 		's,d,s':['曾外孙'],
-		's,d,s,w':['曾外孙妇'],
+		's,d,s,w':['曾外孙媳妇','曾外孙妇'],
 		's,d,s,s':['曾外曾孙'],
 		's,d,s,d':['曾外曾孙女'],
 		's,d,d':['曾外孙女'],
-		's,d,d,h':['曾外孙婿'],
+		's,d,d,h':['曾外孙女婿','曾外孙婿'],
 		's,d,d,s':['曾外曾外孙'],
 		's,d,d,d':['曾外曾外孙女'],
-		'd':['女儿','千金','闺女','女','阿女','女女','掌上明珠','乖囡','囡囡','姑娘','x女儿','孩子','孩儿'],
+		'd':['女儿','千金','闺女','女','阿女','女女','掌上明珠','乖囡','囡囡','姑娘','x女儿'],
 		'd,h':['女婿','姑爷','女婿子','女婿儿','儿婿'],
 		'd,s':['外孙'],
-		'd,s,w':['外孙妇','外孙媳妇'],
+		'd,s,w':['外孙媳妇','外孙妇'],
 		'd,s,s':['外曾孙','重外孙'],
-		'd,s,s,w':['外曾孙妇'],
+		'd,s,s,w':['外曾孙媳妇','外曾孙妇'],
 		'd,s,s,s':['外玄孙'],
 		'd,s,s,d':['外玄孙女'],
 		'd,s,d':['外曾孙女','重外孙女'],
-		'd,s,d,h':['外曾孙婿','重外孙婿'],
+		'd,s,d,h':['外曾孙女婿','外曾孙婿','重外孙婿'],
 		'd,s,d,s':['外玄外孙'],
 		'd,s,d,d':['外玄外孙女'],
 		'd,d':['外孙女','外孙囡'],
-		'd,d,h':['外孙婿','外孙女婿'],
+		'd,d,h':['外孙女婿','外孙婿'],
 		'd,d,s':['外曾外孙'],
 		'd,d,s,w':['外曾外孙妇'],
 		'd,d,s,s':['外曾外曾孙'],

style/index.css

@@ -73,15 +73,19 @@ a:hover{
     width: 100%;
 }
 .mod-panel .hd{
-	padding-top: 25px;
+	padding: 15px 0;
-	margin-bottom: 30px;
+	line-height: 24px;
-	line-height: 30px;
 	text-align: center;
 }
 .mod-panel .hd h1{
+	line-height: 30px;
 	font-size: 24px;
 	color:#212121;
 }
+.mod-panel .hd b{
+	margin: 0 3px;
+	color: #fd7474;
+}
 .mod-panel .bd{
 	max-width: 500px;
 	margin:0 auto 20px;

tests/test.js

@@ -16,6 +16,7 @@ test('relationship.js show to be tested', function (t) {
   t.deepEqual(relationship({text:'哥哥的弟弟的爸爸的儿子',sex:1}),['兄弟','自己']);
   t.deepEqual(relationship({text:'爸爸的舅舅',sex:0,reverse:true}),['甥孙女']);
   t.deepEqual(relationship({text:'舅爷爷',type:'chain'}),['爸爸的妈妈的兄弟']);
+  t.deepEqual(relationship({text:'堂兄弟的孩子',sex:1}),['堂侄','堂侄女']);
 
   t.end();
 });