updated 重新整理旁支关系

src/branch.js

@@ -157,8 +157,16 @@ export default {
     '{G1},s,s,w':['侄妇'],
     '{G1},s,s,s':['侄孙男'],
     '{G1},s,s,s,w':['侄孙妇'],
+    '{G1},s,s,s,s':['侄曾孙男'],
+    '{G1},s,s,s,s,w':['侄曾孙妇'],
+    '{G1},s,s,s,s,s':['侄玄孙男'],
+    '{G1},s,s,s,s,s,w':['侄玄孙妇'],
+    '{G1},s,s,s,s,d':['侄玄孙女'],
+    '{G1},s,s,s,s,d,h':['侄玄孙婿'],
     '{G1},s,s,d':['侄孙女'],
     '{G1},s,s,d,h':['侄孙婿'],
+    '{G1},s,s,s,d':['侄曾孙女'],
+    '{G1},s,s,s,d,h':['侄曾孙婿'],
     '{G1},s,d':['侄女','侄女儿'],
     '{G1},s,d,h':['侄婿'],
     '{G1},s,d,s':['侄外孙男','外孙男'],

src/main.js

@@ -43,7 +43,6 @@ 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':['伯老爷'],
@@ -57,11 +56,21 @@ export default {
     '[f|m],m,xb,w':['舅老姥'],
     '[f|m],m,xs':['姨老姥'],
     '[f|m],m,xs,h':['姨老爷'],
-    'f,[f|m]':['祖父母','爷爷奶奶'],
+    'f,f,[f|m]':['曾祖父母'],
-    'm,[f|m]':['外祖父母','外公外婆','姥姥姥爷'],
-    '[f|m]':['父母','爹娘','爹妈','爸妈','爸爸妈妈','父母亲','双亲','二亲','两亲','二老','高堂'],
     'f,f,[f,xs|m,xb],s':['舅姑爷爷','舅姑爷'],
     'm,f,[f,xs|m,xb],s':['舅姑姥爷'],
+    'f,[f|m]':['祖父母','爷爷奶奶'],
+    'f,[ob|ob,w]':['伯父母'],
+    'f,[lb|lb,w]':['叔父母'],
+    'f,xb,[s|d]':['堂兄弟姐妹','堂姐妹兄弟','从父兄弟姐妹'],
+    'f,[xs|xs,h]':['姑父母'],
+    'f,xs,[s|d]':['姑表兄弟姐妹'],
+    'm,[f|m]':['外祖父母','外公外婆','姥姥姥爷'],
+    'm,[xb|xb,w]':['舅父母'],
+    'm,xb,[s|d]':['舅表兄弟姐妹'],
+    'm,[xs|xs,h]':['姨父母'],
+    'm,xs,[s|d]':['姨兄弟姐妹','姨姐妹兄弟','从母兄弟姐妹'],
+    '[f|m]':['父母','爹娘','爹妈','爸妈','爸爸妈妈','父母亲','双亲','二亲','两亲','二老','高堂'],
     '[f|m],[f,xs|m,xb],s':['舅姑爸','姑舅爸'],
     '[f|m],[f,xs|m,xb],s&o,w':['舅姑姆','姑舅姆'],
     '[f|m],[f,xs|m,xb],s&l,w':['舅姑婶','姑舅婶'],
@@ -70,11 +79,6 @@ export default {
     '[f|m],m,xs,s&o,w':['两姨姆'],
     '[f|m],m,xs,s&l,w':['两姨婶'],
     '[f|m],m,xs,d':['两姨娘娘'],
-    'f,[ob|ob,w]':['伯父母'],
-    'f,[lb|lb,w]':['叔父母'],
-    'f,[xs|xs,h]':['姑父母'],
-    'm,[xb|xb,w]':['舅父母'],
-    'm,[xs|xs,h]':['姨父母'],
     'w,[f|m]':['岳父母','岳父岳母','丈人丈母','舅姑'],
     'w,f,[ob|ob,w]':['伯岳父母'],
     'w,f,[lb|lb,w]':['叔岳父母'],
@@ -82,6 +86,8 @@ export default {
     'w,m,[xb|xb,w]':['舅岳父母'],
     'w,m,[xs|xs,h]':['姨岳父母'],
     'w,[ls|os],h':['襟兄弟'],
+    'w,[f,xs|m,xb],d':['姑舅姨子'],
+    'w,[f,xs|m,xb],d,h':['姑舅连襟','姑舅连桥'],
     'h,[f|m]':['公婆','翁姑','姑翁','大家官','公公婆婆','姑嫜'],
     'h,f,[ob|ob,w]':['伯公婆'],
     'h,f,[lb|lb,w]':['叔公婆'],
@@ -98,16 +104,10 @@ export default {
     '[ob|ob,w]':['哥哥嫂嫂'],
     '[f,xb|m,xs],[s|d]':['从兄弟姐妹','从姐妹兄弟'],
     '[f,xs|m,xb],[s|d]':['表兄弟姐妹','表姐妹兄弟','老表','阿表'],
-    'f,xb,[s|d]':['堂兄弟姐妹','堂姐妹兄弟','从父兄弟姐妹'],
-    'm,xs,[s|d]':['姨兄弟姐妹','姨姐妹兄弟','从母兄弟姐妹'],
-    'f,xs,[s|d]':['姑表兄弟姐妹'],
-    'm,xb,[s|d]':['舅表兄弟姐妹'],
     '[f,xs|m,xb],s':['姑舅兄弟','舅姑兄弟'],
     '[f,xs|m,xb],s&o':['姑舅哥','姑舅哥哥'],
     '[f,xs|m,xb],s&l':['姑舅弟','姑舅弟弟'],
     '[f,xs|m,xb],d':['姑舅姊妹','舅姑姊妹'],
-    'w,[f,xs|m,xb],d':['姑舅姨子'],
-    'w,[f,xs|m,xb],d,h':['姑舅连襟','姑舅连桥'],
     '[f,xs|m,xb],d&o':['姑舅姐','姑舅姐姐'],
     '[f,xs|m,xb],d&l':['姑舅妹','姑舅妹妹'],
     '[f,xs|m,xb],s,s':['姑舅儿子'],
@@ -150,6 +150,16 @@ export default {
     '[s,w|d,h],m,lb,w':['姻仁弟妇'],
     '[s,w|d,h],[f|m],f':['姻太翁'],
     '[s,w|d,h],[f|m],m':['姻太姆'],
+    '[xb,w|xs,h],xb':['亲家兄弟'],
+    '[xb,w|xs,h],ob,w':['亲家嫂子','亲家兄嫂'],
+    '[xb,w|xs,h],lb,w':['亲家弟嫂'],
+    '[xb,w|xs,h],xb,s':['亲家侄男'],
+    '[xb,w|xs,h],xb,d':['亲家侄女'],
+    '[xb,w|xs,h],xs':['亲家姊妹'],
+    '[xb,w|xs,h],os,h':['亲家姐夫'],
+    '[xb,w|xs,h],ls,h':['亲家妹夫'],
+    '[xb,w|xs,h],xs,s':['亲家甥男'],
+    '[xb,w|xs,h],xs,d':['亲家甥女'],
     // 主线
     'f,f,f,f,f,f,f,f,f,f,f,f':['先祖父','先太爷','十二世祖'],
     'f,f,f,f,f,f,f,f,f,f,f,m':['先祖母','先太奶'],
@@ -184,8 +194,6 @@ 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':['曾祖母','外曾外毑母','太婆','太奶','老太奶','太嬷','太姆','太奶奶','老娭毑'],
@@ -195,10 +203,6 @@ 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':['奶奶','祖母','阿奶','阿姆','阿婆','依奶','阿嬷','阿嫲','大母','奶','嫲嫲','婻婻','娭毑','嗯奶','娘姆','媪婆','亲婆'],
@@ -228,29 +232,85 @@ 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':['妈妈','母亲','老妈','阿妈','阿母','阿娘','老母','妈咪','依妈','老娘','老乸','老妈子','妈子','娘老子','妈','母','娘','阿毑','姆嬷','姆妈','娘亲'],
     'f,ob':['伯父','伯伯','伯爸','伯爷','依伯','世父','大爷','大爸','大爸爸','大爹','伯儿','大伯','大大','阿伯','伯'],
     'f,ob,w':['伯母','伯妈','伯娘','依姆','世母','大娘','大妈','大妈妈','大嬷','伯妇','大嬷','大姆妈','伯姐','姆'],
     'f,lb':['叔叔','叔父','叔爸','叔爹','阿叔','叔儿','仲父','季父','叔仔','依叔','小叔','小爹','小爸','尕爸','幺爸','幺爹','幺叔','细叔','满叔','晚叔','叔'],
     'f,lb,w':['婶婶','婶母','婶妈','婶娘','阿婶','婶儿','仲母','季母','叔妇','依婶','小婶','小娘','小妈','尕婶','幺妈','幺娘','幺婶','细婶','满婶','晚婆','婶','婶子','家婶','叔母','叔妈','叔娘','婶爹'],
-    'f,[ob|lb]':['叔伯','几爸爸','几爸','几爹'],
+    'f,[ob|lb]':['伯叔父','叔伯','几爸爸','几爸','几爹'],
-    'f,[ob|lb],w':['几妈妈','几妈','几娘'],
+    'f,[ob|lb],w':['伯叔母','几妈妈','几妈','几娘'],
-    'f,f,f,xb,s,s':['再从父'],
+    'f,xb,s&o':['堂哥','堂阿哥','堂房哥哥','堂房阿哥','叔伯哥哥','叔伯阿哥','堂老兄'],
-    'f,f,f,xb,s,s,w':['再从母'],
+    'f,xb,s&o,w':['堂嫂','堂兄嫂'],
-    'f,f,f,f,xb,s,s,s':['三从父','族父'],
+    'f,xb,s&l':['堂弟','堂阿弟','堂房弟弟','堂房阿弟','叔伯弟弟','叔伯老弟','堂老弟'],
-    'f,f,f,f,xb,s,s,s,w':['三从母','族母'],
+    '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,os':['大姑','大姑妈','姑姊'],
     'f,os,h':['大姑丈','大姑父','大姑爸','恩伯'],
     'f,ls':['小姑','小姑妈','姑姐','姑妹','姑仔','尕娘','幺姑','幺姑姐','老姑','细姑','满姑'],
     'f,ls,h':['小姑丈','小姑父','小姑爹','恩叔'],
     'f,xs':['姑妈','姑母','姑姑','恩妈','嬢嬢','娘娘','姑','阿姑'],
     'f,xs,h':['姑丈','姑父','姑爸','姑爹','姑夫','姑婿','亘'],
+    'f,f,[ob|lb]':['伯叔祖父'],
+    'f,f,[ob|lb],w':['伯叔祖母'],
+    'f,f,xb,s&o':['堂伯'],
+    'f,f,xb,s&o,w':['堂伯母'],
+    'f,f,xb,s&l':['堂叔'],
+    'f,f,xb,s&l,w':['堂婶'],
+    'f,f,xb,[s&o|s&l]':['堂伯叔父','堂叔伯','从父'],
+    'f,f,xb,[s&o|s&l],w':['堂伯叔母','从母'],
+    'f,f,xb,s,s&o':['从堂兄'],
+    'f,f,xb,s,s&l':['从堂弟'],
+    '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,xb,d':['堂姑'],
+    'f,f,xb,d,h':['堂姑丈'],
+    'f,f,f,[ob|lb]':['伯叔曾祖父'],
+    'f,f,f,[ob|lb],w':['伯叔曾祖母'],
+    'f,f,f,xb,[s&o|s&l]':['堂伯叔祖父'],
+    'f,f,f,xb,[s&o|s&l],w':['堂伯叔祖母'],
+    'f,f,f,xb,s,s&o':['从伯父'],
+    'f,f,f,xb,s,s&o,w':['从伯母'],
+    'f,f,f,xb,s,s&l':['从叔父'],
+    'f,f,f,xb,s,s&l,w':['从叔母'],
+    'f,f,f,xb,s,[s&o|s&l]':['从伯叔父','再从父'],
+    'f,f,f,xb,s,[s&o|s&l],w':['从伯叔母','再从母'],
+    'f,f,f,xb,s,s,s&o':['族兄'],
+    'f,f,f,xb,s,s,s&l':['族弟'],
+    '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':['族侄玄孙','四玄孙','族玄孙'],
+    'f,f,f,f,[ob|lb]':['伯叔高祖父'],
+    'f,f,f,f,[ob|lb],w':['伯叔高祖母'],
+    'f,f,f,f,xb,[s&o|s&l]':['堂伯叔曾祖父'],
+    'f,f,f,f,xb,[s&o|s&l],w':['堂伯叔曾祖母'],
+    'f,f,f,f,xb,s,[s&o|s&l]':['从伯叔祖父'],
+    'f,f,f,f,xb,s,[s&o|s&l],w':['从伯叔祖母'],
+    'f,f,f,f,xb,s,s,s&o':['族伯父'],
+    'f,f,f,f,xb,s,s,s&o,w':['族伯母'],
+    'f,f,f,f,xb,s,s,s&l':['族叔父'],
+    'f,f,f,f,xb,s,s,s&l,w':['族叔母'],
+    'f,f,f,f,xb,s,s,[s&o|s&l]':['族伯叔父','三从父','族父'],
+    'f,f,f,f,xb,s,s,[s&o|s&l],w':['族伯叔母','三从母','族母'],
+    //  母系
+    'm':['妈妈','母亲','老妈','阿妈','阿母','阿娘','老母','妈咪','依妈','老娘','老乸','老妈子','妈子','娘老子','妈','母','娘','阿毑','姆嬷','姆妈','娘亲'],
     'm,ob':['大舅','大舅舅','舅伯','元舅'],
     'm,ob,w':['大舅妈','大妗','舅嫲'],
     'm,lb':['小舅','小舅舅','舅仔','舅父仔','幺舅','老舅','细舅','满舅','尕阿舅'],
@@ -263,14 +323,6 @@ export default {
     'm,ls,h':['小姨丈','小姨父','小姨爹','老姨夫','姨叔'],
     'm,xs':['姨妈','姨母','姨姨','姨娘','阿姨','姨','从母'],
     'm,xs,h':['姨丈','姨父','姨爸','姨爹','姨夫','姨婿','姨郎','尹'],
-    'f,f,xb,s&o':['堂伯'],
-    '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],w':['从母'],
-    'f,f,xb,d':['堂姑'],
-    'f,f,xb,d,h':['堂姑丈'],
     'm,f,xb,s':['堂舅'],
     'm,f,xb,s,w':['堂舅妈'],
     'm,f,xb,d':['堂姨'],
@@ -379,7 +431,7 @@ export default {
     'w,xs,s,d':['姨甥孙女','姨孙女'],
     'w,xs,d,s':['姨甥外孙','姨外孙','姨外孙男','姨外孙男'],
     'w,xs,d,d':['姨甥外孙女','姨外孙女'],
-    // 兄弟
+    // 兄弟姐妹系
     'ob':['哥哥','哥','胞兄','亲哥','老哥','依哥','阿哥','家兄','兄长','大佬','元兄','长兄'],
     'ob,w':['嫂子','嫂','嫂嫂','阿嫂','家嫂','兄姊','兄嫂','兄妇','兄妻'],
     'ob,s':['兄子'],
@@ -392,7 +444,6 @@ export default {
     'xb,s,w':['侄媳妇','侄媳','侄嫂','侄妇'],
     'xb,d':['侄女','侄囡','侄女儿','侄闺女'],
     'xb,d,h':['侄女婿','侄婿'],
-    // 姐妹
     'os':['姐姐','姐','胞姐','亲姐','阿姐','阿姊','姊仔','家姐','依姐','长姐'],
     'os,h':['姐夫','姐丈','姐婿','姐郎','姊兄','姐夫哥','胞姐夫'],
     'ls':['妹妹','妹','胞妹','亲妹','阿妹','妹儿','妹子','依妹','幺妹','细妹','满妹','幼妹'],
@@ -403,35 +454,7 @@ export default {
     'xs,s,d':['甥孙女','远甥女','弥甥女'],
     'xs,d':['外甥女','外甥囡','外甥女儿','外甥闺女'],
     'xs,d,h':['外甥女婿','甥婿'],
-    // 旁系
+    // 子系
-    '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':['儿媳','儿媳妇','息妇儿','儿媳妇儿','新妇','新妇囝','心抱','息妇','儿妇','子妇','小妇','少奶奶','少夫人'],
     's,w,f':['亲家公'],

src/prefix.js

@@ -45,10 +45,13 @@ var prefix = {
         'f,ob':['伯'],
         'f,lb':['叔','仲','季'],
         'm,xb':['舅'],
+        'f,f,xb,s':['堂','从父','叔伯','从'],
         'f,f,xb,s&o':['堂伯','从父伯','叔伯伯','从伯'],
         'f,f,xb,s&l':['堂叔','从父叔','叔伯叔','从叔'],
+        'f,f,f,xb,s,s':['从堂'],
         'f,f,f,xb,s,s&o':['从堂伯'],
         'f,f,f,xb,s,s&l':['从堂叔'],
+        'f,f,f,f,xb,s,s,s':['族'],
         'f,f,xs,s&o':['姑表伯'],
         'f,f,xs,s&l':['姑表叔'],
         'f,m,xb,s&o':['舅表伯'],