updated 称呼种的一些bug修复

src/branch.js

@@ -149,17 +149,17 @@ export default {
     // 同辈及以下
     '{G1},[s&o|s&l]':['兄弟'],
     '{G1},[s&o|s&l],w':['兄弟妇'],
-    '{G1},s&o':['哥'],
+    '{G1},s&o':['哥','兄'],
-    '{G1},s&o,w':['嫂','嫂子'],
+    '{G1},s&o,w':['嫂','嫂子','兄妇'],
     '{G1},s&l':['弟'],
-    '{G1},s&l,w':['弟媳'],
+    '{G1},s&l,w':['弟媳','弟妇'],
-    '{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,w':['侄外孙妇'],
@@ -171,13 +171,13 @@ export default {
     '{G1},d&o,h':['姐夫'],
     '{G1},d&l':['妹'],
     '{G1},d&l,h':['妹夫'],
-    '{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,w':['甥外孙妇'],

src/main.js

@@ -43,6 +43,7 @@ export default {
     '[f,m|m,f|m,m],m,xs':['姨太姥姥','太姨姥姥'],
     '[f,m|m,f|m,m],m,xs,h':['姨太姥爷','太姨姥爷'],
     '[f|m],[f|m],[f|m]':['曾祖辈','祖祖','老太'],
+    'f,f,[f|m]':['曾祖父母'],
     '[f|m],[f|m]':['祖辈'],
     '[f|m],f':['老爷'],
     '[f|m],f,ob':['伯老爷'],
@@ -183,6 +184,8 @@ export default {
     'm,m,f,m':['外曾外曾祖母','高外毑母'],
     'm,m,m,f':['外曾外曾外祖父','高毑父'],
     'm,m,m,m':['外曾外曾外祖母','高毑母'],
+    'f,f,f,f,xb':['从高祖父'],
+    'f,f,f,f,xb,w':['从高祖母'],
     // 曾祖辈
     'f,f,f':['曾祖父','曾祖','外曾外毑父','太公','太爷','老太爷','祖爷','太翁','佬嗲','太爷爷','三世祖'],
     'f,f,m':['曾祖母','外曾外毑母','太婆','太奶','老太奶','太嬷','太姆','太奶奶','老娭毑'],
@@ -192,6 +195,10 @@ export default {
     'm,f,m':['外曾祖母','曾外毑母','外太婆','外太奶','外太嬷','外太姆','外太奶奶','老外婆','老外奶','老姥姥','老姥娘','老嫏娘'],
     'm,m,f':['外曾外祖父','外曾外祖','曾毑父','外太外公','外太外爷','外太外翁','外太外爷爷','外太姥爷','老外公','老外爷','老姥爷'],
     'm,m,m':['外曾外祖母','曾毑母','外太外婆','外太外奶','外太外嬷','外太外姆','外太外奶奶','外太姥姥','老外婆','老外奶','老姥姥','老姥娘','老嫏娘'],
+    'f,f,f,xb':['从曾祖父'],
+    'f,f,f,xb,w':['从曾祖母'],
+    'f,f,f,f,xb,s':['再从曾祖父'],
+    'f,f,f,f,xb,s,w':['再从曾祖母'],
     // 祖父辈
     'f,f':['爷爷','祖父','奶爷','阿爷','阿公','依爷','嗲嗲','爷儿','大父','爷','爷老','爷老子','爷老倌','二世祖'],
     'f,m':['奶奶','祖母','阿奶','阿姆','阿婆','依奶','阿嬷','阿嫲','大母','奶','嫲嫲','婻婻','娭毑','嗯奶','娘姆','媪婆','亲婆'],
@@ -201,8 +208,8 @@ export default {
     'f,f,ob,w':['伯婆','姆婆','大奶奶'],
     'f,f,lb':['叔公','叔祖','叔翁','小爷爷','晚公','幺爷','细嗲'],
     'f,f,lb,w':['叔婆','婶婆','晚婆','幺奶','小奶奶'],
-    'f,f,xb':['堂祖父','几爷爷','几大爷','几嗲','几爷','几公'],
+    'f,f,xb':['堂祖父','从祖父','几爷爷','几大爷','几嗲','几爷','几公'],
-    'f,f,xb,w':['堂祖母','几奶奶','几大娘','几奶','几婆'],
+    'f,f,xb,w':['堂祖母','从祖母','几奶奶','几大娘','几奶','几婆'],
     'f,f,xs':['姑奶奶','祖姑','恩婆'],
     'f,f,xs,h':['姑爷爷','姑公公','恩爹','祖姑丈','姑丈公','丈公'],
     'f,m,xb':['舅爷爷','舅祖','舅爹','太舅父'],
@@ -221,6 +228,10 @@ export default {
     'm,m,xb,w':['舅外婆','舅婆','妗姥姥','妗姥娘','妗姥','外妗婆'],
     'm,m,xs':['姨外婆','姨婆'],
     'm,m,xs,h':['姨外公','姨公','外姨丈公','外丈公'],
+    'f,f,f,xb,s':['再从祖父'],
+    'f,f,f,xb,s,w':['再从祖母'],
+    'f,f,f,f,xb,s,s':['三从祖父','族祖父'],
+    'f,f,f,f,xb,s,s,w':['三从祖母','族祖母'],
     // 父辈
     'f':['爸爸','父亲','老爸','阿爸','阿父','阿爹','老窦','爹地','依爹','老爹','老汉','老爷子','老子','牙老子','爸','父','爹','老汉儿','牙老倌','爸比','爹爹','爹啲','一世祖'],
     'm':['妈妈','母亲','老妈','阿妈','阿母','阿娘','老母','妈咪','依妈','老娘','老乸','老妈子','妈子','娘老子','妈','母','娘','阿毑','姆嬷','姆妈','娘亲'],
@@ -230,6 +241,10 @@ export default {
     'f,lb,w':['婶婶','婶母','婶妈','婶娘','阿婶','婶儿','仲母','季母','叔妇','依婶','小婶','小娘','小妈','尕婶','幺妈','幺娘','幺婶','细婶','满婶','晚婆','婶','婶子','家婶','叔母','叔妈','叔娘','婶爹'],
     'f,[ob|lb]':['叔伯','几爸爸','几爸','几爹'],
     'f,[ob|lb],w':['几妈妈','几妈','几娘'],
+    'f,f,f,xb,s,s':['再从父'],
+    'f,f,f,xb,s,s,w':['再从母'],
+    'f,f,f,f,xb,s,s,s':['三从父','族父'],
+    'f,f,f,f,xb,s,s,s,w':['三从母','族母'],
     'f,os':['大姑','大姑妈','姑姊'],
     'f,os,h':['大姑丈','大姑父','大姑爸','恩伯'],
     'f,ls':['小姑','小姑妈','姑姐','姑妹','姑仔','尕娘','幺姑','幺姑姐','老姑','细姑','满姑'],
@@ -252,22 +267,14 @@ export default {
     'f,f,xb,s&o,w':['堂伯母'],
     'f,f,xb,s&l':['堂叔'],
     'f,f,xb,s&l,w':['堂婶'],
-    'f,f,xb,[s&o|s&d]':['堂叔伯'],
+    'f,f,xb,[s&o|s&d]':['堂叔伯','从父'],
+    'f,f,xb,[s&o|s&d],w':['从母'],
     'f,f,xb,d':['堂姑'],
     'f,f,xb,d,h':['堂姑丈'],
     'm,f,xb,s':['堂舅'],
     'm,f,xb,s,w':['堂舅妈'],
     'm,f,xb,d':['堂姨'],
     'm,f,xb,d,h':['堂姨丈'],
-    // 同辈
-    'f,xb,s&o':['堂哥','堂阿哥','堂房哥哥','堂房阿哥','叔伯哥哥','叔伯阿哥','堂老兄'],
-    'f,xb,s&o,w':['堂嫂','堂兄嫂'],
-    'f,xb,s&l':['堂弟','堂阿弟','堂房弟弟','堂房阿弟','叔伯弟弟','叔伯老弟','堂老弟'],
-    'f,xb,s&l,w':['堂弟媳','堂弟妇','堂弟妹'],
-    'f,xb,d&o':['堂姐','堂阿姐','堂房姐姐','堂房阿姐','叔伯姐姐','叔伯阿姊','堂大姐'],
-    'f,xb,d&o,h':['堂姐夫'],
-    'f,xb,d&l':['堂妹','堂阿妹','堂房妹妹','堂房阿妹','叔伯妹妹','叔伯老妹','堂细妹'],
-    'f,xb,d&l,h':['堂妹夫'],
     // 婆家
     'h,f,f,f':['曾祖公父','曾祖公','太公翁'],
     'h,f,f,m':['曾祖婆母','曾祖婆','太奶亲'],
@@ -396,15 +403,34 @@ export default {
     'xs,s,d':['甥孙女','远甥女','弥甥女'],
     'xs,d':['外甥女','外甥囡','外甥女儿','外甥闺女'],
     'xs,d,h':['外甥女婿','甥婿'],
-    // 堂表亲
+    // 旁系
-    'f,xb,s,s':['堂侄'],
+    'f,xb,s&o':['堂哥','堂阿哥','堂房哥哥','堂房阿哥','叔伯哥哥','叔伯阿哥','堂老兄'],
+    'f,xb,s&o,w':['堂嫂','堂兄嫂'],
+    'f,xb,s&l':['堂弟','堂阿弟','堂房弟弟','堂房阿弟','叔伯弟弟','叔伯老弟','堂老弟'],
+    'f,xb,s&l,w':['堂弟媳','堂弟妇','堂弟妹'],
+    'f,xb,s,s':['堂侄','再从子'],
     'f,xb,s,s,w':['堂侄媳妇'],
+    'f,xb,s,s,s':['再从孙'],
+    'f,xb,s,s,s,s':['再曾孙'],
+    'f,xb,s,s,s,s,s':['再玄孙'],
     'f,xb,s,d':['堂侄女'],
     'f,xb,s,d,h':['堂侄女婿'],
+    'f,xb,d&o':['堂姐','堂阿姐','堂房姐姐','堂房阿姐','叔伯姐姐','叔伯阿姊','堂大姐'],
+    'f,xb,d&o,h':['堂姐夫'],
+    'f,xb,d&l':['堂妹','堂阿妹','堂房妹妹','堂房阿妹','叔伯妹妹','叔伯老妹','堂细妹'],
+    'f,xb,d&l,h':['堂妹夫'],
     'f,xb,d,s':['堂外甥'],
     'f,xb,d,s,w':['堂外甥媳妇'],
     'f,xb,d,d':['堂外甥女'],
     'f,xb,d,d,h':['堂外甥女婿'],
+    'f,f,xb,s,s,s':['三从子','族子'],
+    'f,f,xb,s,s,s,s':['三从孙','族孙'],
+    'f,f,xb,s,s,s,s,s':['三曾孙','族曾孙'],
+    'f,f,xb,s,s,s,s,s,s':['三玄孙','族玄孙'],
+    'f,f,f,xb,s,s,s,s':['四从子','族子'],
+    'f,f,f,xb,s,s,s,s,s':['四从孙','族孙'],
+    'f,f,f,xb,s,s,s,s,s,s':['四曾孙','族曾孙'],
+    'f,f,f,xb,s,s,s,s,s,s,s':['四玄孙','族玄孙'],
     // 子辈
     's':['儿子','男儿','息男','闺男','囝囝','囝男','小子','娃子','男亲','伢子','长子','次子','幼子','儿','仔','囝','子','阿仔','仔仔','后生','公子','少爷','一世孙'],
     's,w':['儿媳','儿媳妇','息妇儿','儿媳妇儿','新妇','新妇囝','心抱','息妇','儿妇','子妇','小妇','少奶奶','少夫人'],
@@ -554,7 +580,13 @@ export default {
     'd,d,d,s,w':['外曾外曾外孙媳妇'],
     'd,d,d,d':['外曾外曾外孙女'],
     'd,d,d,d,h':['外曾外曾外孙女婿'],
-    // 从
+    // 和性别相关
+    '1,xb,w,xb':['叔眷兄弟'],
+    '1,xb,w,xb,s':['叔眷舅男'],
+    '1,xb,w,xb,d':['叔眷舅女'],
+    '1,xb,w,xs':['叔眷姊妹'],
+    '1,xb,w,xs,s':['叔眷姨男'],
+    '1,xb,w,xs,d':['叔眷姨女'],
     '1,xb,s':['从男','从子'],
     '1,xb,s,s':['从孙'],
     '1,xb,s,s,s':['从曾孙'],
@@ -562,77 +594,13 @@ export default {
     '1,xb,s,w':['从妇'],
     '1,xb,d':['从女','从子'],
     '1,xb,d,h':['从婿'],
-    '1,xs,s,s':['离孙'],
-    '1,f,xb,s&o':['从兄'],
-    '1,f,xb,s&o,w':['从兄妇'],
-    '1,f,xb,s&l':['从弟'],
-    '1,f,xb,s&l,w':['从弟妇'],
-    '1,f,xb,s,s':['再从子'],
-    '1,f,xb,s,s,s':['再从孙'],
-    '1,f,xb,s,s,s,s':['再曾孙'],
-    '1,f,xb,s,s,s,s,s':['再玄孙'],
-    '1,f,f,xb':['从祖父'],
-    '1,f,f,xb,w':['从祖母'],
-    '1,f,f,xb,s':['从父'],
-    '1,f,f,xb,s,w':['从母'],
-    '1,f,f,xb,s,s&o':['再从兄'],
-    '1,f,f,xb,s,s&o,w':['再从兄妇'],
-    '1,f,f,xb,s,s&l':['再从弟'],
-    '1,f,f,xb,s,s&l,w':['再从弟妇'],
-    '1,f,f,xb,s,s,s':['三从子','族子'],
-    '1,f,f,xb,s,s,s,s':['三从孙','族孙'],
-    '1,f,f,xb,s,s,s,s,s':['三曾孙','族曾孙'],
-    '1,f,f,xb,s,s,s,s,s,s':['三玄孙','族玄孙'],
-    '1,f,f,f,xb':['从曾祖父'],
-    '1,f,f,f,xb,w':['从曾祖母'],
-    '1,f,f,f,xb,s':['再从祖父'],
-    '1,f,f,f,xb,s,w':['再从祖母'],
-    '1,f,f,f,xb,s,s':['再从父'],
-    '1,f,f,f,xb,s,s,w':['再从母'],
-    '1,f,f,f,xb,s,s,s&o':['三从兄','族兄'],
-    '1,f,f,f,xb,s,s,s&o,w':['三从兄妇','族兄妇'],
-    '1,f,f,f,xb,s,s,s&l':['三从弟','族弟'],
-    '1,f,f,f,xb,s,s,s&l,w':['三从弟妇','族弟妇'],
-    '1,f,f,f,xb,s,s,s,s':['四从子','族子'],
-    '1,f,f,f,xb,s,s,s,s,s':['四从孙','族孙'],
-    '1,f,f,f,xb,s,s,s,s,s,s':['四曾孙','族曾孙'],
-    '1,f,f,f,xb,s,s,s,s,s,s,s':['四玄孙','族玄孙'],
-    '1,f,f,f,f,xb':['从高祖父'],
-    '1,f,f,f,f,xb,w':['从高祖母'],
-    '1,f,f,f,f,xb,s':['再从曾祖父'],
-    '1,f,f,f,f,xb,s,w':['再从曾祖母'],
-    '1,f,f,f,f,xb,s,s':['三从祖父','族祖父'],
-    '1,f,f,f,f,xb,s,s,w':['三从祖母','族祖母'],
-    '1,f,f,f,f,xb,s,s,s':['三从父','族父'],
-    '1,f,f,f,f,xb,s,s,s,w':['三从母','族母'],
-    '1,f,f,f,f,xb,s,s,s,s&o':['四从兄','族兄'],
-    '1,f,f,f,f,xb,s,s,s,s&o,w':['四从兄妇','族兄妇'],
-    '1,f,f,f,f,xb,s,s,s,s&l':['四从弟','族弟'],
-    '1,f,f,f,f,xb,s,s,s,s&l,w':['四从弟妇','族弟妇'],
-    '0,xb,s':['娘家侄子','娘家侄'],
-    '0,xb,s,s':['归孙'],
-    '0,xb,d':['娘家侄女'],
-    '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':['姨甥外孙','姨外孙','姨甥外孙男','姨外孙男'],
-    '0,xs,d,d':['姨甥外孙女','姨外孙女'],
-    // 姻亲
-    '1,xb,w,xb':['叔眷兄弟'],
-    '1,xb,w,xb,s':['叔眷舅男'],
-    '1,xb,w,xb,d':['叔眷舅女'],
-    '1,xb,w,xs':['叔眷姊妹'],
-    '1,xb,w,xs,s':['叔眷姨男'],
-    '1,xb,w,xs,d':['叔眷姨女'],
     '1,xs,h,xb':['姑姻兄弟'],
     '1,xs,h,xb,s':['姑姻叔男'],
     '1,xs,h,xb,d':['姑姻叔女'],
     '1,xs,h,xs':['姑姻姊妹'],
     '1,xs,h,xs,s':['姑姻姑男'],
     '1,xs,h,xs,d':['姑姻姑女'],
+    '1,xs,s,s':['离孙'],
     '0,xb,w,xb':['舅眷兄弟'],
     '0,xb,w,xb,s':['舅眷舅男'],
     '0,xb,w,xb,d':['舅眷舅女'],
@@ -645,4 +613,15 @@ export default {
     '0,xs,h,xs':['姨姻姊妹'],
     '0,xs,h,xs,s':['姨姻姑男'],
     '0,xs,h,xs,d':['姨姻姑女'],
+    '0,xb,s':['娘家侄子','娘家侄'],
+    '0,xb,s,s':['归孙'],
+    '0,xb,d':['娘家侄女'],
+    '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':['姨甥外孙','姨外孙','姨甥外孙男','姨外孙男'],
+    '0,xs,d,d':['姨甥外孙女','姨外孙女'],
 };

src/prefix.js

@@ -49,7 +49,6 @@ var prefix = {
         'f,f,xb,s&l':['堂叔','从父叔','叔伯叔','从叔'],
         'f,f,f,xb,s,s&o':['从堂伯'],
         'f,f,f,xb,s,s&l':['从堂叔'],
-        'f,f,f,xb,s,s':['族'],
         'f,f,xs,s&o':['姑表伯'],
         'f,f,xs,s&l':['姑表叔'],
         'f,m,xb,s&o':['舅表伯'],