从表关系完善

dist/relationship.js

@@ -229,10 +229,7 @@
 		'f,f,f,xs':['曾祖姑母','姑曾祖母','太姑婆','姑婆太','姑太太','曾祖姑','姑婆奶奶'],
 		'f,f,f,xs,h':['曾祖姑丈','姑曾祖父','太姑丈公','姑丈公太','姑太爷','姑公老爷'],
 		'f,f,f,xs,s&o':['表伯祖父'],
-		'f,f,f,xs,s&o,w':['表伯祖母'],
+		'f,f,f,xs,s&o,w':['表伯姊妹母','族祖姑'],
-		'f,f,f,xs,s&l':['表叔祖父'],
-		'f,f,f,xs,s&l,w':['表叔祖母'],
-		'f,f,f,xs,d':['表姑祖母','族祖姑'],
 		'f,f,f,xs,d,h':['表姑祖父'],
 		'f,f,m':['曾祖母','太奶奶','太婆','祖婆','祖奶奶'],
 		'f,f,m,f':['高外祖父','祖太姥爷','祖太公'],
@@ -289,12 +286,16 @@
 		'f,f,xs,s&o,w':['姑表伯母','表伯母'],
 		'f,f,xs,s&l':['姑表叔父','表叔父','表叔爸','表叔'],
 		'f,f,xs,s&l,w':['姑表叔母','表叔母','表叔妈','表婶'],
-		'f,f,xs,s,s':['从表兄弟'],
+		'f,f,xs,s,s&o':['姑表叔表兄','从表兄'],
-		'f,f,xs,s,d':['从表姐妹'],
+		'f,f,xs,s,s&l':['姑表叔表弟','从表弟'],
+		'f,f,xs,s,d&o':['姑表叔表姐妹','从表姐'],
+		'f,f,xs,s,d&l':['姑表叔表妹','从表妹'],
 		'f,f,xs,d':['姑表姑母','表姑妈','表姑母','表姑姑','表姑'],
 		'f,f,xs,d,h':['姑表姑父','表姑爸','表姑父','表姑丈'],
-		'f,f,xs,d,s':['从表兄弟'],
+		'f,f,xs,d,s&o':['姑表姑表兄','从表兄'],
-		'f,f,xs,d,d':['从表姐妹'],
+		'f,f,xs,d,s&l':['姑表姑表弟','从表弟'],
+		'f,f,xs,d,d&o':['姑表姑表姐','从表姐'],
+		'f,f,xs,d,d&l':['姑表姑表妹','从表妹'],
 		'f,m':['奶奶','祖母','阿嫲','阿嬷','嫲嫲'],
 		'f,m,f':['曾外祖父','外太公','太姥爷'],
 		'f,m,f,f':['曾外曾祖父','祖太爷','祖太爷爷','祖太公'],
@@ -334,24 +335,32 @@
 		'f,m,xb,s&o,w':['舅表伯母','表伯母'],
 		'f,m,xb,s&l':['舅表叔父','表叔父','表叔爸','表叔'],
 		'f,m,xb,s&l,w':['舅表叔母','表叔母','表叔妈','表婶'],
-		'f,m,xb,s,s':['从表兄弟'],
+		'f,m,xb,s,s&o':['舅表叔表兄','从表兄'],
-		'f,m,xb,s,d':['从表姐妹'],
+		'f,m,xb,s,s&l':['舅表叔表弟','从表弟'],
+		'f,m,xb,s,d&o':['舅表叔表姐','从表姐'],
+		'f,m,xb,s,d&l':['舅表叔表妹','从表妹'],
 		'f,m,xb,d':['舅表姑母','表姑妈','表姑母','表姑姑','表姑'],
 		'f,m,xb,d,h':['舅表姑父','表姑爸','表姑父','表姑丈'],
-		'f,m,xb,d,s':['从表兄弟'],
+		'f,m,xb,d,s&o':['舅表姑表兄','从表兄'],
-		'f,m,xb,d,d':['从表姐妹'],
+		'f,m,xb,d,s&l':['舅表姑表弟','从表弟'],
+		'f,m,xb,d,d&o':['舅表姑表姐','从表姐'],
+		'f,m,xb,d,d&l':['舅表姑表妹','从表妹'],
 		'f,m,xs':['姨奶奶','祖姨母','姨祖母','姨婆','姨奶'],
 		'f,m,xs,h':['姨爷爷','祖姨父','姨祖父','姨公','姨丈公','姨爷','姨老爷','姨奶爷'],
 		'f,m,xs,s&o':['姨表伯父','表伯','表伯父','从母伯父'],
 		'f,m,xs,s&o,w':['姨表伯母','表伯母','从母伯母'],
 		'f,m,xs,s&l':['姨表叔父','表叔父','表叔爸','表叔','从母叔父'],
 		'f,m,xs,s&l,w':['姨表叔母','表叔母','表叔妈','表婶','从母叔母'],
-		'f,m,xs,s,s':['从表兄弟'],
+		'f,m,xs,s,s&o':['姨表叔表兄','从表兄'],
-		'f,m,xs,s,d':['从表姐妹'],
+		'f,m,xs,s,s&l':['姨表叔表弟','从表弟'],
+		'f,m,xs,s,d&o':['姨表叔表姐','从表姐'],
+		'f,m,xs,s,d&l':['姨表叔表妹','从表妹'],
 		'f,m,xs,d':['姨表姑母','表姑妈','表姑母','表姑姑','表姑','从母姑母'],
 		'f,m,xs,d,h':['姨表姑父','表姑爸','表姑父','表姑丈','从母姑父'],
-		'f,m,xs,d,s':['从表兄弟'],
+		'f,m,xs,d,s&o':['姨表姑表兄','从表兄'],
-		'f,m,xs,d,d':['从表姐妹'],
+		'f,m,xs,d,s&l':['姨表姑表弟','从表弟'],
+		'f,m,xs,d,d&o':['姨表姑表姐','从表姐'],
+		'f,m,xs,d,d&l':['姨表姑表妹','从表妹'],
 		'f,xb,w,f':['姻伯公'],
 		'f,xb,w,m':['姻伯婆'],
 		'f,xb,w,xb':['姻世伯'],
@@ -376,10 +385,10 @@
 		'f,xb,d&l,h':['堂妹夫'],
 		'f,xb,d,s':['堂外甥'],
 		'f,xb,d,d':['堂外甥女'],
-		'f,ob':['伯父','伯伯','阿伯','大伯','x伯'],
+		'f,ob':['伯父','伯伯','阿伯','大伯','大爹','大爸','x伯'],
-		'f,ob,w':['伯母','大娘','大妈','x妈'],
+		'f,ob,w':['伯母','伯妈','伯娘','大娘','大妈','x妈'],
-		'f,lb':['叔叔','叔父','阿叔','叔爸','叔爹','仲父','x叔','叔'],
+		'f,lb':['叔叔','叔父','阿叔','叔爸','叔爹','仲父','小爹','小爸','x叔','叔'],
-		'f,lb,w':['婶婶','婶母','阿婶','家婶','叔母','叔妈','叔娘','季母','x婶','婶'],
+		'f,lb,w':['婶婶','婶母','阿婶','家婶','叔母','叔妈','叔娘','季母','小娘','小妈','x婶','婶'],
 		//姑家
 		'f,xs':['姑妈','姑姑','姑娘','大姑妈','姑','x姑妈'],
 		'f,xs,h':['姑丈','姑父','姑爸','姑夫','x姑丈','x姑父'],
@@ -407,8 +416,12 @@
 		'f,xs,d&o,h':['姑表姐夫','表姐夫','表姐丈'],
 		'f,xs,d&l':['姑表妹','表妹'],
 		'f,xs,d&l,h':['姑表妹夫','表妹夫'],
-		'f,xs,d,s':['表外甥','姑表甥男','表甥男','甥男'],
+		'f,xs,d,s':['表外甥男','表外甥','姑表甥男','表甥男'],
-		'f,xs,d,d':['表外甥女','姑表甥女','表甥女','甥女'],
+		'f,xs,d,s,s':['表外甥孙男'],
+		'f,xs,d,s,d':['表外甥孙女'],
+		'f,xs,d,d':['表外甥女','表外甥','姑表甥女','表甥女'],
+		'f,xs,xb,d,d,s':['表外甥外孙男'],
+		'f,xs,d,d,d':['表外甥外孙女'],
 		'f,os':['姑妈','姑母'],
 		'f,ls':['姑妈','姑姐'],
 		//外家
@@ -475,12 +488,16 @@
 		'm,f,xs,h':['姑姥爷','姑外祖父','外姑祖父','外太姑父','外姑公','外姑丈'],
 		'm,f,xs,s':['姑表舅父','姑表舅爸','表舅父','表舅爸','表舅','表舅舅','姑表舅舅'],
 		'm,f,xs,s,w':['姑表舅母','姑表舅妈','表舅母','表舅妈'],
-		'm,f,xs,s,s':['从表兄弟'],
+		'm,f,xs,s,s&o':['姑表舅表兄','从表兄'],
-		'm,f,xs,s,d':['从表姐妹'],
+		'm,f,xs,s,s&l':['姑表舅表弟','从表弟'],
+		'm,f,xs,s,d&o':['姑表舅表姐','从表姐'],
+		'm,f,xs,s,d&l':['姑表舅表妹','从表妹'],
 		'm,f,xs,d':['姑表姨母','姑表姨妈','表姨母','表姨妈','表姨','表阿姨','姑表姨姨'],
 		'm,f,xs,d,h':['姑表姨父','姑表姨父','表姨丈','表姨父'],
-		'm,f,xs,d,s':['从表兄弟'],
+		'm,f,xs,d,s&o':['姑表姨表兄','从表兄'],
-		'm,f,xs,d,d':['从表姐妹'],
+		'm,f,xs,d,s&l':['姑表姨表弟','从表弟'],
+		'm,f,xs,d,d&o':['姑表姨表姐','从表姐'],
+		'm,f,xs,d,d&l':['姑表姨表妹','从表妹'],
 		'm,m':['外婆','外祖母','姥姥','阿婆'],
 		'm,m,f':['外曾外祖父','外太外公','外太姥爷'],
 		'm,m,f,f':['外曾外曾祖父','祖太爷','祖太爷爷','祖太公'],
@@ -561,8 +578,12 @@
 		'm,xb,d&o,h':['舅表姐夫','表姐夫','表姐丈'],
 		'm,xb,d&l':['舅表妹','表妹'],
 		'm,xb,d&l,h':['舅表妹夫','表妹夫'],
-		'm,xb,d,s':['表外甥','舅表甥男','表甥男','甥男'],
+		'm,xb,d,s':['表外甥男','表外甥','舅表甥男','表甥男'],
-		'm,xb,d,d':['表外甥女','舅表甥女','表甥女','甥女'],
+		'm,xb,d,s,s':['表外甥孙男'],
+		'm,xb,d,s,d':['表外甥孙女'],
+		'm,xb,d,d':['表外甥女','表外甥','舅表甥女','表甥女'],
+		'm,xb,d,d,s':['表外甥外孙男'],
+		'm,xb,d,d,d':['表外甥外孙女'],
 		'm,ob':['大舅'],
 		'm,ob,w':['大舅妈'],
 		'm,lb':['小舅','舅父仔'],
@@ -594,8 +615,12 @@
 		'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,d':['表外甥女','姨表甥女','表甥女','甥女'],
+		'm,xs,d,s,s':['表外甥孙男'],
+		'm,xs,d,s,d':['表外甥孙女'],
+		'm,xs,d,d':['表外甥女','表外甥','姨表甥女','表甥女'],
+		'm,xs,d,d,s':['表外甥外孙男'],
+		'm,xs,d,d,d':['表外甥外孙女'],
 		'm,os':['大姨','大姨妈'],
 		'm,os,h':['大姨父','大姨丈'],
 		'm,ls':['小姨','小姨妈','姨仔'],