updated 数据完善

script/relationship.js

@@ -562,14 +562,18 @@
         'ob,w':['嫂子','嫂','嫂嫂','兄姊','兄嫂','兄妇','兄妻','阿嫂'],
         'lb':['弟弟','弟','胞弟','老弟','阿弟','细佬','小弟','幺弟','细弟','满弟'],
         'lb,w':['弟妹','弟媳','弟媳妇','弟新妇'],
-        '0,xb,w,xb,s':['舅眷舅男'],
+        '1,xb,w,xb':['叔眷兄弟'],
         '1,xb,w,xb,s':['叔眷舅男'],
-        '0,xb,w,xb,d':['舅眷舅女'],
         '1,xb,w,xb,d':['叔眷舅女'],
-        '0,xb,w,xs,s':['舅眷姨男'],
+        '1,xb,w,xs':['叔眷姊妹'],
         '1,xb,w,xs,s':['叔眷姨男'],
-        '0,xb,w,xs,d':['舅眷姨女'],
         '1,xb,w,xs,d':['叔眷姨女'],
+        '0,xb,w,xb':['舅眷兄弟'],
+        '0,xb,w,xb,s':['舅眷舅男'],
+        '0,xb,w,xb,d':['舅眷舅女'],
+        '0,xb,w,xs':['舅眷姊妹'],
+        '0,xb,w,xs,s':['舅眷姨男'],
+        '0,xb,w,xs,d':['舅眷姨女'],
         'xb,s':['侄子','侄男','侄儿','阿侄','侄','侄仔'],
         'xb,s,w':['侄媳妇','侄嫂','侄妇'],
         'xb,d':['侄女','侄囡','侄女儿','侄闺女'],
@@ -585,14 +589,18 @@
         'os,h':['姐夫','姐丈','姐婿','姐郎','姊兄','姐夫哥','胞姐夫'],
         'ls':['妹妹','妹','胞妹','阿妹','幺妹','细妹','满妹'],
         'ls,h':['妹夫','妹丈','妹婿','妹郎','妹弟','妹夫子','胞妹夫'],
-        '0,xs,h,xb,s':['姨姻叔男'],
+        '1,xs,h,xb':['姑姻兄弟'],
         '1,xs,h,xb,s':['姑姻叔男'],
-        '0,xs,h,xb,d':['姨姻叔女'],
         '1,xs,h,xb,d':['姑姻叔女'],
-        '0,xs,h,xs,s':['姨姻姑男'],
+        '1,xs,h,xs':['姑姻姊妹'],
         '1,xs,h,xs,s':['姑姻姑男'],
-        '0,xs,h,xs,d':['姨姻姑女'],
         '1,xs,h,xs,d':['姑姻姑女'],
+        '0,xs,h,xb':['姨姻兄弟'],
+        '0,xs,h,xb,s':['姨姻叔男'],
+        '0,xs,h,xb,d':['姨姻叔女'],
+        '0,xs,h,xs':['姨姻姊妹'],
+        '0,xs,h,xs,s':['姨姻姑男'],
+        '0,xs,h,xs,d':['姨姻姑女'],
         'xs,s':['外甥','外甥男','外甥儿','外甥子','外甥儿子'],
         'xs,s,w':['外甥媳妇','甥嫂'],
         'xs,s,s':['甥孙','远甥','弥甥'],
@@ -1218,64 +1226,102 @@
     	'{M1W},m':['外祖母'],
     	'{M1W},xb':['舅父'],
     	'{M1W},xb,w':['舅母'],
+        '{M1W},xb,[s|d]':['舅表兄弟姊妹'],
+        '{M1W},xb,[s&o|s&l]':['舅表兄弟'],
+        '{M1W},xb,[s&o|s&l],w':['舅表兄弟妇'],
     	'{M1W},xb,s&o':['舅表兄'],
     	'{M1W},xb,s&o,w':['舅表兄妇'],
     	'{M1W},xb,s&l':['舅表弟'],
     	'{M1W},xb,s&l,w':['舅表弟妇'],
-    	'{M1W},xb,s,s':['侄男'],
+    	'{M1W},xb,s,s':['舅表侄男','侄男'],
-    	'{M1W},xb,s,s,w':['侄妇'],
+    	'{M1W},xb,s,s,w':['舅表侄妇','侄妇'],
-    	'{M1W},xb,s,d':['侄女'],
+    	'{M1W},xb,s,d':['舅表侄女','侄女'],
-    	'{M1W},xb,s,d,h':['侄婿'],
+    	'{M1W},xb,s,d,h':['舅表侄婿','侄婿'],
+        '{M1W},xb,[d&o|d&l]':['舅表姊妹'],
+        '{M1W},xb,[d&o|d&l],h':['舅表姊妹壻'],
     	'{M1W},xb,d&o':['舅表姊'],
     	'{M1W},xb,d&o,h':['舅表姊壻'],
     	'{M1W},xb,d&l':['舅表妹'],
     	'{M1W},xb,d&l,h':['舅表妹壻'],
-    	'{M1W},xb,d,s':['甥男'],
+    	'{M1W},xb,d,s':['舅表甥男','甥男'],
-    	'{M1W},xb,d,s,w':['甥妇'],
+    	'{M1W},xb,d,s,w':['舅表甥妇','甥妇'],
-    	'{M1W},xb,d,d':['甥女'],
+    	'{M1W},xb,d,d':['舅表甥女','甥女'],
-    	'{M1W},xb,d,d,h':['甥婿'],
+    	'{M1W},xb,d,d,h':['舅表甥婿','甥婿'],
     	'{M1W},xs':['姨母'],
     	'{M1W},xs,h':['姨父'],
+        '{M1W},xs,[s|d]':['姨表兄弟姊妹'],
+        '{M1W},xs,[s&o|s&l]':['姨表兄弟'],
+        '{M1W},xs,[s&o|s&l],w':['姨表兄弟妇'],
     	'{M1W},xs,s&o':['姨表兄'],
     	'{M1W},xs,s&o,w':['姨表兄妇'],
     	'{M1W},xs,s&l':['姨表弟'],
     	'{M1W},xs,s&l,w':['姨表弟妇'],
+        '{M1W},xs,s,s':['姨表侄男','侄男'],
+    	'{M1W},xs,s,s,w':['姨表侄妇','侄妇'],
+    	'{M1W},xs,s,d':['姨表侄女','侄女'],
+    	'{M1W},xs,s,d,h':['姨表侄婿','侄婿'],
+        '{M1W},xs,[d&o|d&l]':['姨表姊妹'],
+        '{M1W},xs,[d&o|d&l],h':['姨表姊妹壻'],
     	'{M1W},xs,d&o':['姨表姊'],
     	'{M1W},xs,d&o,h':['姨表姊壻'],
     	'{M1W},xs,d&l':['姨表妹'],
     	'{M1W},xs,d&l,h':['姨表妹壻'],
+        '{M1W},xs,d,s':['姨表甥男','甥男'],
+    	'{M1W},xs,d,s,w':['姨表甥妇','甥妇'],
+    	'{M1W},xs,d,d':['姨表甥女','甥女'],
+    	'{M1W},xs,d,d,h':['姨表甥婿','甥婿'],
     	'{M1M},f':['祖父'],
     	'{M1M},m':['祖母'],
+        '{M1M},xb':['叔伯父'],
+        '{M1M},xb,w':['叔伯母'],
     	'{M1M},ob':['伯父'],
     	'{M1M},ob,w':['伯母'],
     	'{M1M},lb':['叔父'],
     	'{M1M},lb,w':['叔母'],
+        '{M1M},xb,[s|d]':['叔表兄弟姊妹'],
+        '{M1M},xb,[s&o|s&l]':['叔表兄弟'],
+        '{M1M},xb,[s&o|s&l],w':['叔表兄弟妇'],
     	'{M1M},xb,s&o':['叔表兄'],
     	'{M1M},xb,s&o,w':['叔表兄妇'],
     	'{M1M},xb,s&l':['叔表弟'],
     	'{M1M},xb,s&l,w':['叔表弟妇'],
-    	'{M1M},xb,s,s':['侄男','侄子','侄儿'],
+    	'{M1M},xb,s,s':['叔表侄男','侄男'],
-    	'{M1M},xb,s,s,w':['侄妇'],
+    	'{M1M},xb,s,s,w':['叔表侄妇','侄妇'],
-    	'{M1M},xb,s,d':['侄女'],
+    	'{M1M},xb,s,d':['叔表侄女','侄女'],
-    	'{M1M},xb,s,d,h':['侄婿'],
+    	'{M1M},xb,s,d,h':['叔表侄婿','侄婿'],
+        '{M1M},xb,[d&o|d&l]':['叔表姊妹'],
+        '{M1M},xb,[d&o|d&l],h':['叔表姊妹壻'],
     	'{M1M},xb,d&o':['叔表姊'],
     	'{M1M},xb,d&o,h':['叔表姊壻'],
     	'{M1M},xb,d&l':['叔表妹'],
     	'{M1M},xb,d&l,h':['叔表妹壻'],
-    	'{M1M},xb,d,s':['甥男'],
+    	'{M1M},xb,d,s':['叔表甥男','甥男'],
-    	'{M1M},xb,d,s,w':['甥妇'],
+    	'{M1M},xb,d,s,w':['叔表甥妇','甥妇'],
-    	'{M1M},xb,d,d':['甥女'],
+    	'{M1M},xb,d,d':['叔表甥女','甥女'],
-    	'{M1M},xb,d,d,h':['甥婿'],
+    	'{M1M},xb,d,d,h':['叔表甥婿','甥婿'],
     	'{M1M},xs':['姑母'],
     	'{M1M},xs,h':['姑父'],
+        '{M1M},xs,[s|d]':['姑表兄弟姊妹'],
+        '{M1M},xs,[s&o|s&l]':['姑表兄弟'],
+        '{M1M},xs,[s&o|s&l],w':['姑表兄弟妇'],
     	'{M1M},xs,s&o':['姑表兄'],
     	'{M1M},xs,s&o,w':['姑表兄妇'],
     	'{M1M},xs,s&l':['姑表弟'],
     	'{M1M},xs,s&l,w':['姑表弟妇'],
+        '{M1M},xs,s,s':['姑表侄男','侄男'],
+    	'{M1M},xs,s,s,w':['姑表侄妇','侄妇'],
+    	'{M1M},xs,s,d':['姑表侄女','侄女'],
+    	'{M1M},xs,s,d,h':['姑表侄婿','侄婿'],
+        '{M1M},xs,[d&o|d&l]':['姑表姊妹'],
+        '{M1M},xs,[d&o|d&l],h':['姑表姊妹壻'],
     	'{M1M},xs,d&o':['姑表姊'],
     	'{M1M},xs,d&o,h':['姑表姊壻'],
     	'{M1M},xs,d&l':['姑表妹'],
     	'{M1M},xs,d&l,h':['姑表妹壻'],
+        '{M1M},xs,d,s':['姑表甥男','甥男'],
+    	'{M1M},xs,d,s,w':['姑表甥妇','甥妇'],
+    	'{M1M},xs,d,d':['姑表甥女','甥女'],
+    	'{M1M},xs,d,d,h':['姑表甥婿','甥婿'],
         '{M0},f':['父'],
     	'{M0},f,f':['祖父'],
     	'{M0},f,f,ob':['伯祖父'],
@@ -1384,6 +1430,7 @@
     	'{M0},xs,s,w':['甥妇'],
     	'{M0},xs,d':['甥女'],
     	'{M0},xs,d,h':['甥婿'],
+        '{M-1},[f&o|f&l]':['兄弟'],
     	'{M-1},f&o':['兄'],
     	'{M-1},f&l':['弟'],
     	'{M-1},f,f':['父'],
@@ -1412,6 +1459,7 @@
     	'{M-1},f,ls,h':['姑妹壻'],
     	'{M-1},f,xs,s':['姑男'],
     	'{M-1},f,xs,d':['姑女'],
+        '{M-1},[m&o|m&l]':['姊妹'],
     	'{M-1},m&o':['姊'],
     	'{M-1},m&l':['妹'],
     	'{M-1},m,f':['父'],