updated 别称完善

script/relationship.js

@@ -476,8 +476,8 @@
         'h,f,f,f,xs,h':['姑曾祖公父','姑曾祖婆'],
         'h,f,f':['祖公父','祖公','祖翁','奶公父'],
         'h,f,m':['祖婆母','祖婆','奶婆母'],
-        'h,m,f':['外祖公父','外祖公','姥公父','姥公'],
+        'h,m,f':['外祖公父','毑公父','外祖公','姥公父','姥公'],
-        'h,m,m':['外祖婆母','外祖婆','姥婆母','姥婆'],
+        'h,m,m':['外祖婆母','毑婆母','外祖婆','姥婆母','姥婆'],
         'h,f':['公公','公父','家公','家官','翁亲','大官','老公公','老人公','公爹','老公爹','婆父','婆爹'],
         'h,m':['婆婆','婆母','家婆','家娘','姑亲','大家','老婆婆','老人婆','婆妈','婆母娘','婆子妈'],
         'h,f,ob':['伯公父','伯公','伯翁'],
@@ -528,8 +528,8 @@
         'w,f,ob,w':['伯岳母','姻姆'],
         'w,f,lb':['叔岳父','姻叔','姻叔丈'],
         'w,f,lb,w':['叔岳母','姻婶'],
-        'w,m,f':['外祖岳父','外祖丈人','外太岳父','姥岳父','姥丈爷','姥丈人','姥爷丈人','老丈爷'],
+        'w,m,f':['外祖岳父','毑岳父','外祖丈人','外太岳父','姥岳父','姥丈爷','姥丈人','姥爷丈人','老丈爷'],
-        'w,m,m':['外祖岳母','外祖丈母娘','外祖丈母','外太岳母','姥岳母','姥丈姥','姥丈母','姥丈母娘'],
+        'w,m,m':['外祖岳母','毑岳母','外祖丈母娘','外祖丈母','外太岳母','姥岳母','姥丈姥','姥丈母','姥丈母娘'],
         'w,f':['岳父','岳丈','岳老子','老干爷','老丈人','丈母爷','老丈杆子','丈人爹','丈爷爹','岳翁','丈人','丈人公','丈父','丈爷','外父','妻父','泰山','外舅','老亲爷'],
         'w,m':['岳母','丈母娘','丈姥娘','岳母娘','老干娘','老丈母','丈人娘','丈母','丈母婆','丈姥','外母','泰水','外姑','老亲娘'],
         'w':['老婆','妻子','太太','媳妇儿','媳妇','夫人','女人','婆娘','妻','内人','内子','娘子','爱妻','老太婆','婆子','老婆子','老婆仔','堂客','爱人','老伴','那口子','配偶','伴侣','伉俪','卿卿'],
@@ -571,13 +571,15 @@
         '0,xb,w,xs,d':['舅眷姨女'],
         '1,xb,w,xs,d':['叔眷姨女'],
         'xb,s':['侄子','侄男','侄儿','阿侄','侄','侄仔'],
-        'xb,s,w':['侄媳妇','侄嫂'],
+        'xb,s,w':['侄媳妇','侄嫂','侄妇'],
-        'xb,d':['侄女','侄囡','侄女儿','侄闺女','从女'],
+        'xb,d':['侄女','侄囡','侄女儿','侄闺女'],
         'xb,d,h':['侄女婿','侄婿'],
         '0,xb,s':['娘家侄子','娘家侄'],
         '0,xb,d':['娘家侄女'],
         '1,xb,s':['从男','从子'],
+        '1,xb,s,w':['从妇'],
         '1,xb,d':['从女','从子'],
+        '1,xb,d,h':['从婿'],
         // 姐妹
         'os':['姐姐','姐','胞姐','阿姐','姊仔','家姐'],
         'os,h':['姐夫','姐丈','姐婿','姐郎','姊兄','姐夫哥','胞姐夫'],
@@ -598,7 +600,9 @@
         'xs,d':['外甥女','外甥囡','外甥女儿','外甥闺女'],
         'xs,d,h':['外甥女婿','甥婿'],
         '0,xs,s':['姨甥','姨甥男','从男','从子'],
+        '0,xs,s,w':['从妇'],
         '0,xs,d':['姨甥女','从女','从子'],
+        '0,xs,d,h':['从婿'],
         '0,xs,s,s':['姨甥孙','姨孙','姨甥孙男','姨孙男'],
         '0,xs,s,d':['姨甥孙女','姨孙女'],
         '0,xs,d,s':['姨甥外孙','姨外孙','姨甥外孙男','姨外孙男'],
@@ -783,6 +787,7 @@
     	'{G1M}':{
             'f,ob':['伯'],
     		'f,lb':['叔'],
+            'f,xb':['伯','仲','叔','季'],
             'm,xb':['舅'],
             'f,f,xb,s&o':['堂伯','从父伯','叔伯伯','从伯'],
             'f,f,xb,s&l':['堂叔','从父叔','叔伯叔','从叔'],
@@ -802,7 +807,7 @@
     	},
         '{G1W}':{
             'f,xs':['姑'],
-    		'm,xs':['姨'],
+    		'm,xs':['姨','姏','茙','荻'],
             'f,f,xb,d':['堂姑','从父姑'],
             'f,f,f,xb,s,d':['从堂姑'],
             'f,f,xs,d':['姑表姑'],
@@ -1023,6 +1028,10 @@
         'm,{G1M},w':['外祖母','外婆','外奶','外?婆','外?祖母','外太?母','姥姥','姥娘','姥婆','毑婆','毑毑','嘎嘎','嫏嫏','嫏娘','姥'],
         'm,{G1W}':['外祖母','外婆','外奶','外?婆','外?祖母','外太?母','姥姥','姥娘','姥婆','毑婆','毑毑','嘎嘎','嫏嫏','嫏娘','姥'],
         'm,{G1W},h':['外祖父','外公','外爷','外?公','外?祖父','外太?父','姥爷','姥公','毑公','毑爷','嘎公'],
+        '{G1M}':['父'],
+        '{G1M},w':['母'],
+        '{G1W}':['母'],
+        '{G1W},h':['父'],
         // 父辈
         'f,{G1},s&o':['伯父','伯伯','伯','大爷'],
         'f,{G1},s&o,w':['伯母','大娘'],
@@ -1035,39 +1044,41 @@
     	'm,{G1},d':['姨母','姨姨','姨妈','姨'],
     	'm,{G1},d,h':['姨父','姨爸','姨丈'],
         // 同辈及以下
+        '{G1},[s&o|s&l]':['兄弟'],
+        '{G1},[s&o|s&l],w':['兄弟妇'],
         '{G1},s&o':['哥'],
         '{G1},s&o,w':['嫂','嫂子'],
         '{G1},s&l':['弟'],
         '{G1},s&l,w':['弟媳'],
-        '{G1},[s&o|s&l]':['兄弟'],
+        '{G1},s,s':['侄男','侄子','侄儿','男'],
-        '{G1},s,s':['侄男','侄子','侄儿'],
         '{G1},s,s,w':['侄妇'],
-        '{G1},s,s,s':['侄孙男'],
+        '{G1},s,s,s':['侄孙男','孙男'],
         '{G1},s,s,s,w':['侄孙妇'],
-        '{G1},s,s,d':['侄孙女'],
+        '{G1},s,s,d':['侄孙女','孙女'],
         '{G1},s,s,d,h':['侄孙婿'],
-        '{G1},s,d':['侄女','侄女儿'],
+        '{G1},s,d':['侄女','侄女儿','女'],
         '{G1},s,d,h':['侄婿'],
-        '{G1},s,d,s':['侄外孙男'],
+        '{G1},s,d,s':['侄外孙男','外孙男'],
         '{G1},s,d,s,w':['侄外孙妇'],
-        '{G1},s,d,d':['侄外孙女'],
+        '{G1},s,d,d':['侄外孙女','外孙女'],
         '{G1},s,d,d,h':['侄外孙婿'],
+        '{G1},[d&o|d&l]':['姐妹'],
+        '{G1},[d&o|d&l],h':['姐妹壻'],
         '{G1},d&o':['姐'],
         '{G1},d&o,h':['姐夫'],
         '{G1},d&l':['妹'],
         '{G1},d&l,h':['妹夫'],
-        '{G1},[d&o|d&l]':['姐妹'],
+        '{G1},d,s':['甥男','男'],
-        '{G1},d,s':['甥男'],
         '{G1},d,s,w':['甥妇'],
-        '{G1},d,s,s':['甥孙男'],
+        '{G1},d,s,s':['甥孙男','孙男'],
         '{G1},d,s,s,w':['甥孙妇'],
-        '{G1},d,s,d':['甥孙女'],
+        '{G1},d,s,d':['甥孙女','孙女'],
         '{G1},d,s,d,h':['甥孙婿'],
-        '{G1},d,d':['甥女'],
+        '{G1},d,d':['甥女','女'],
         '{G1},d,d,h':['甥婿'],
-        '{G1},d,d,s':['甥外孙男'],
+        '{G1},d,d,s':['甥外孙男','外孙男'],
         '{G1},d,d,s,w':['甥外孙妇'],
-        '{G1},d,d,d':['甥外孙女'],
+        '{G1},d,d,d':['甥外孙女','外孙女'],
         '{G1},d,d,d,h':['甥外孙婿'],
         // 其他旁系
         '{G2}':['祖父'],
@@ -1083,8 +1094,14 @@
         '{G2},s,s,s':['男','子'],
         '{G2},s,s,d':['女'],
         // 夫族
-        'h,f,{G1M}':['祖公父','祖公','祖翁'],
+        'h,f,{G1M}':['祖公父','祖公','祖翁','奶公'],
-        'h,f,{G1M},w':['祖婆母','祖婆','祖姆'],
+        'h,f,{G1M},w':['祖婆母','祖婆','祖姆','奶婆'],
+        'h,f,{G1W}':['祖婆母','祖婆','祖姆','奶婆'],
+        'h,f,{G1W},h':['祖公父','祖公','祖翁','奶公'],
+        'h,m,{G1M}':['外祖公父','外祖公','外祖翁','姥公'],
+        'h,m,{G1M},w':['外祖婆母','外祖婆','外祖姆','姥婆'],
+        'h,m,{G1W}':['外祖婆母','外祖婆','外祖姆','姥婆'],
+        'h,m,{G1W},h':['外祖公父','外祖公','外祖翁','姥公'],
         'h,{G1M}':['公父','公公'],
         'h,{G1M},w':['婆母','婆婆'],
         'h,{G1W}':['婆母','婆婆'],
@@ -1492,8 +1509,7 @@
             '^从表':['从父姑表','从父舅表','从父姨表','从母姑表','从母舅表','从母叔表'],
             '^表表':['姑表叔表','姑表姑表','姑表舅表','姑表姨表','舅表叔表','舅表姑表','舅表舅表','舅表姨表'],
             '^([夫妻]?)表':['$1姑表','$1舅表','$1姑表伯','$1姑表叔','$1舅表伯','$1舅表叔'],
-            '^姑表(?=[^伯叔])':['姑表伯','姑表叔'],
+            '^([姑舅])表(?=[^伯叔])':['$1表伯','$1表叔'],
-            '^舅表(?=[^伯叔])':['舅表伯','舅表叔'],
             '^姻':['姑姻','姨姻','姊妹姻','女姻'],
             '^眷':['叔眷','舅眷','兄弟眷','男眷'],
             '^亲家':['姊妹姻','兄弟眷'],
@@ -1504,6 +1520,7 @@
             '^([舅叔])([曾玄外]*)孙':['$1侄$2孙'],
             '^([姨姑])([曾玄外]*)孙':['$1甥$2孙'],
             '([孙甥侄])$':['$1男','$1女'],
+            '([姑舅姨叔])([孙外]*)([男女])$':['$1表侄$2$3','$1表甥$2$3'],
             '祖$':['祖父','祖母'],
             '嫂$':['兄妇'],
             '女儿$':['女'],