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

script/relationship.js

@@ -542,9 +542,9 @@
         'w,m':['岳母','丈母娘','丈姥娘','岳母娘','老干娘','老丈母','丈人娘','丈人婆','丈母','丈母婆','丈姆','丈姆婆','丈姥','外母','泰水','外姑','老亲娘'],
         'w':['老婆','妻子','太太','媳妇儿','媳妇','夫人','女人','婆娘','妻','内人','内子','娘子','爱妻','发妻','老太婆','婆子','老婆子','老婆儿','老婆仔','堂客','爱人','老伴','那口子','配偶','伴侣','伉俪','卿卿'],
         'w,ob':['大舅子','大舅哥','大舅佬','大阿舅','舅哥'],
-        'w,ob,w':['大舅妇','大舅姆','大舅兄嫂','舅嫂','大舅嫂','大舅姐','大舅媳妇','大妗子','大妗儿'],
+        'w,ob,w':['大舅妇','大舅姆','大舅兄嫂','大舅嫂','大舅姐','大舅媳妇','大妗子','大妗儿'],
         'w,lb':['小舅子','小舅弟','小舅佬','小阿舅','舅弟'],
-        'w,lb,w':['小舅妇','小舅姆','小舅弟妇','舅弟媳','小舅妹','小舅媳妇','小妗子','小妗儿'],
+        'w,lb,w':['小舅妇','小舅姆','小舅弟妇','小舅嫂','舅弟媳','小舅妹','小舅媳妇','小妗子','小妗儿'],
         'w,xb':['舅子','舅佬','妻舅','老婆舅','阿舅','亲家舅'],
         'w,xb,w':['舅嫂','妻妗','妗仔','妗子','妗儿'],
         'w,xb,s':['舅侄','舅侄男','舅男'],
@@ -788,7 +788,7 @@
     		'f,m,xs,s':['从母叔表'],
     		'f,m,xs,d':['从母姑表'],
     		'm,f,xb,s':['堂舅表','从父舅表'],
-    		'm,f,xb,d':['堂姨表',,'从父姨表'],
+    		'm,f,xb,d':['堂姨表','从父姨表'],
     		'm,f,xs,s':['姑表舅表'],
     		'm,f,xs,d':['姑表姨表'],
     		'm,m,xb,s':['舅表舅表'],
@@ -802,8 +802,7 @@
     	},
     	'{G1M}':{
             'f,ob':['伯'],
-    		'f,lb':['叔'],
+    		'f,lb':['叔','仲','季'],
-            'f,xb':['伯','仲','叔','季'],
             'm,xb':['舅'],
             'f,f,xb,s&o':['堂伯','从父伯','叔伯伯','从伯'],
             'f,f,xb,s&l':['堂叔','从父叔','叔伯叔','从叔'],
@@ -946,7 +945,7 @@
     		'xs,d,s,w':['甥外孙眷'],
     		'xs,d,d,h':['甥外孙姻'],
             'h,xb,s,s,w':['叔侄孙眷','叔伯孙眷','叔孙眷'],
-            'h,xb,s,d,h':['叔侄孙姻','叔伯孙姻',,'叔孙姻'],
+            'h,xb,s,d,h':['叔侄孙姻','叔伯孙姻','叔孙姻'],
             'h,xb,d,s,w':['叔侄外孙眷','叔伯外孙眷','叔外孙眷'],
             'h,xb,d,d,h':['叔侄外孙姻','叔伯外孙姻','叔外孙姻'],
             'h,xs,s,s,w':['姑甥孙眷','姑孙眷'],
@@ -1040,10 +1039,10 @@
         'f,{G1M},w':['祖母','婆','太?母','奶奶','奶'],
         'f,{G1W}':['祖母','婆','太?母','奶奶','奶'],
         'f,{G1W},h':['祖父','公','太?父','奶爷','爷爷','爷'],
-        'm,{G1M}':['外祖父','外公','外爷','外?公','外?祖父','外太?父','姥爷','姥公','毑公','毑爷','毑父','嘎公'],
+        'm,{G1M}':['外祖父','外公','外爷','外?公','外?祖父','外太?父','太外?父','姥爷','姥公','毑公','毑爷','毑父','嘎公'],
-        'm,{G1M},w':['外祖母','外婆','外奶','外?婆','外?祖母','外太?母','姥姥','姥娘','姥婆','毑婆','毑毑','毑母','嘎嘎','嫏嫏','嫏娘','姥'],
+        'm,{G1M},w':['外祖母','外婆','外奶','外?婆','外?祖母','外太?母','太外?母','姥姥','姥娘','姥婆','毑婆','毑毑','毑母','嘎嘎','嫏嫏','嫏娘','姥'],
-        'm,{G1W}':['外祖母','外婆','外奶','外?婆','外?祖母','外太?母','姥姥','姥娘','姥婆','毑婆','毑毑','毑母','嘎嘎','嫏嫏','嫏娘','姥'],
+        'm,{G1W}':['外祖母','外婆','外奶','外?婆','外?祖母','外太?母','太外?母','姥姥','姥娘','姥婆','毑婆','毑毑','毑母','嘎嘎','嫏嫏','嫏娘','姥'],
-        'm,{G1W},h':['外祖父','外公','外爷','外?公','外?祖父','外太?父','姥爷','姥公','毑公','毑爷','毑父','嘎公'],
+        'm,{G1W},h':['外祖父','外公','外爷','外?公','外?祖父','外太?父','太外?父','姥爷','姥公','毑公','毑爷','毑父','嘎公'],
         'f,f,{G1},s&o':['伯祖父','伯爷爷'],
         'f,f,{G1},s&o,w':['伯祖母','伯奶奶'],
         'f,f,{G1},s&l':['叔祖父','叔爷爷'],
@@ -1157,12 +1156,12 @@
         // 妻族
         'w,f,{G1M}':['祖岳父','太?岳','祖丈人','爷丈人','奶爷丈人'],
         'w,f,{G1M},w':['祖岳母','太?岳母','祖丈母','祖丈母娘','奶丈母娘','奶丈母'],
-        'w,f,{G1W}':['祖岳母',,'太?岳母','祖丈母','祖丈母娘','奶丈母娘','奶丈母'],
+        'w,f,{G1W}':['祖岳母','太?岳母','祖丈母','祖丈母娘','奶丈母娘','奶丈母'],
-        'w,f,{G1W},h':['祖岳父',,'太?岳父','祖丈人','爷丈人','奶爷丈人'],
+        'w,f,{G1W},h':['祖岳父','太?岳父','祖丈人','爷丈人','奶爷丈人'],
-        'w,m,{G1M}':['外祖岳父','太外?岳','外祖丈人','姥爷丈人'],
+        'w,m,{G1M}':['外祖岳父','外太?岳父','太外?岳父','外祖丈人','姥爷丈人'],
-        'w,m,{G1M},w':['外祖岳母','太外?岳母','外祖丈母','外祖丈母娘','姥丈母娘','姥丈母'],
+        'w,m,{G1M},w':['外祖岳母','外太?岳母','太外?岳母','外祖丈母','外祖丈母娘','姥丈母娘','姥丈母'],
-        'w,m,{G1W}':['外祖岳母',,'太外?岳母','外祖丈母','外祖丈母娘','姥丈母娘','姥丈母'],
+        'w,m,{G1W}':['外祖岳母','外太?岳母','太外?岳母','外祖丈母','外祖丈母娘','姥丈母娘','姥丈母'],
-        'w,m,{G1W},h':['外祖岳父',,'太外?岳父','外祖丈人','外爷丈人','姥爷丈人'],
+        'w,m,{G1W},h':['外祖岳父','外太?岳父','太外?岳父','外祖丈人','外爷丈人','姥爷丈人'],
         'w,{G1M}':['岳父','丈人','丈人爹'],
         'w,{G1M},w':['岳母','丈母','丈母娘'],
         'w,{G1W}':['岳母','丈母','丈母娘'],