From 82f41c7a55a72c134d118f9110b2474394e8b1d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=B5=A9=E4=B9=90?= <89932980@qq.com>
Date: Thu, 17 Mar 2016 15:31:36 +0800
Subject: [PATCH] =?UTF-8?q?updated=20=E6=B7=BB=E5=8A=A0=E5=B2=B3=E5=AE=B6?=
 =?UTF-8?q?=E9=95=BF=E8=BE=88=E7=9A=84=E7=A7=B0=E5=91=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 script/relationship.js | 76 +++++++++++++++++++++++++-----------------
 1 file changed, 46 insertions(+), 30 deletions(-)

diff --git a/script/relationship.js b/script/relationship.js
index a31bff7..7ed35d4 100644
--- a/script/relationship.js
+++ b/script/relationship.js
@@ -294,6 +294,16 @@
 		//岳家
 		'w,m':['岳母','丈母娘'],
 		'w,f':['岳父','老丈人','丈人'],
+		'w,f,ob':['伯岳'],
+		'w,f,ob,w':['伯岳母'],
+		'w,f,lb':['叔岳'],
+		'w,f,lb,w':['叔岳母'],
+		'w,f,f':['太岳父'],
+		'w,f,m':['太岳母'],
+		'w,f,f,ob':['太伯岳'],
+		'w,f,f,ob,w':['太伯岳母'],
+		'w,f,f,lb,':['太叔岳'],
+		'w,f,f,lb,w':['太叔岳母'],
 		'w,ob':['大舅哥','大舅子','内兄'],
 		'w,ob,w':['嫂子','大妗子','内嫂'],
 		'w,lb':['小舅子','内弟'],
@@ -309,13 +319,18 @@
 		//婆家
 		'h,m':['婆婆'],
 		'h,f':['公公'],
+		'h,f,xb,s&o':['堂兄'],
+		'h,f,xb,s&o,w':['堂嫂'],
+		'h,f,xb,s&l':['堂弟'],
+		'h,f,xb,s&l,w':['堂小弟'],
 		'h,ob':['大伯子'],
 		'h,ob,w':['大婶子','大伯娘','大嫂'],
 		'h,lb':['小叔子'],
 		'h,lb,w':['小婶子'],
 		'h,xb,s':['侄子'],
-		'h,xb,s,w':['侄媳妇'],
-		'h,xb,s,s':['侄孙子'],
+		'h,xb,s,w':['侄媳','侄媳妇'],
+		'h,xb,s,s':['侄孙','侄孙子'],
+		'h,xb,s,s,w':['侄孙媳'],
 		'h,xb,s,d':['侄孙女'],
 		'h,xb,d':['侄女'],
 		'h,xb,d,h':['侄女婿'],
@@ -331,6 +346,34 @@
 		'h,m,xb,w':['舅婆'],
 		'h,m,xs':['姨婆'],
 		'h,m,xs,h':['姨公'],
+		//旁支
+		'ob':['哥哥','哥','兄','大哥','大佬'],
+		'ob,w':['嫂子','嫂'],
+		'lb':['弟弟','弟'],
+		'lb,w':['弟妹'],
+		'xb,s':['侄子'],
+		'xb,s,w':['侄媳','侄媳妇'],
+		'xb,s,s':['侄孙','侄孙子'],
+		'xb,s,s,w':['侄孙媳'],
+		'xb,s,d':['侄孙女'],
+		'xb,d':['侄女'],
+		'xb,d,h':['侄女婿'],
+		'xb,d,s':['外侄孙子'],
+		'xb,d,d':['外侄孙女'],
+		'os':['姐姐','姐'],
+		'os,h':['姐夫'],
+		'ls':['妹妹','妹'],
+		'ls,h':['妹夫'],
+		'xs,s':['外甥'],
+		'xs,s,w':['外甥媳妇'],
+		'xs,s,s':['甥孙'],
+		'xs,s,d':['甥孙女'],
+		'xs,d':['外甥女','甥女'],
+		'xs,d,h':['外甥女婿'],
+		'xs,d,s':['甥外孙'],
+		'xs,d,s,w':['甥外孙媳妇'],
+		'xs,d,d':['甥外孙女'],
+		'xs,d,d,h':['甥外孙女婿'],
 		//内家
 		'f,f,f,f':['高祖父'],
 		'f,f,f,m':['高祖母'],
@@ -381,38 +424,11 @@
 		'd,d,h':['外孙女婿'],
 		'd,d,s':['外曾外孙'],
 		'd,d,d':['外曾外孙女'],
-		//旁支
-		'ob':['哥哥','哥','兄','大哥','大佬'],
-		'ob,w':['嫂子','嫂'],
-		'lb':['弟弟','弟'],
-		'lb,w':['弟妹'],
-		'xb,s':['侄子'],
-		'xb,s,w':['侄媳妇'],
-		'xb,s,s':['侄孙子'],
-		'xb,s,d':['侄孙女'],
-		'xb,d':['侄女'],
-		'xb,d,h':['侄女婿'],
-		'xb,d,s':['外侄孙子'],
-		'xb,d,d':['外侄孙女'],
-		'os':['姐姐','姐'],
-		'os,h':['姐夫'],
-		'ls':['妹妹','妹'],
-		'ls,h':['妹夫'],
-		'xs,s':['外甥'],
-		'xs,s,w':['外甥媳妇'],
-		'xs,s,s':['甥孙'],
-		'xs,s,d':['甥孙女'],
-		'xs,d':['外甥女','甥女'],
-		'xs,d,h':['外甥女婿'],
-		'xs,d,s':['甥外孙'],
-		'xs,d,s,w':['甥外孙媳妇'],
-		'xs,d,d':['甥外孙女'],
-		'xs,d,d,h':['甥外孙女婿'],
 		//其他
 		's,w,m':['亲家母'],
 		's,w,f':['亲家公'],
 		'd,h,m':['亲家母'],
-		'd,h,f':['亲家公'],
+		'd,h,f':['亲家公']
 	};
 
 	//数组去重