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

This commit is contained in:
mumuy 2022-03-03 15:17:06 +08:00
commit f1fddf7d9c
2 changed files with 21 additions and 19 deletions

File diff suppressed because one or more lines are too long

View File

@ -1,7 +1,7 @@
/*!
* relationship - Chinese kinship library
* https://passer-by.com/relationship/
*
*
* Copyright (c) 2016-present, HaoLe Zheng
* Released under the MIT License.
* https://github.com/mumuy/relationship/blob/master/LICENSE
@ -200,12 +200,12 @@
'[f|m]':['父母','爹娘','爹妈','爸妈','爸爸妈妈','父母亲','双亲','二亲','两亲','二老','高堂'],
'[h,f|h,m]':['公婆','翁姑','大家官','公公婆婆','姑嫜'],
'[w,f|w,m]':['岳父母','岳父岳母','丈人丈母','舅姑'],
'[f,xb,s|f,xb,d|m,xs,s|m,xs,d]':['从兄弟姐妹'],
'[f,xb,s|f,xb,d]':['堂兄弟姐妹'],
'[m,xs,s|m,xs,d]':['姨兄弟姐妹'],
'[f,xb,s|f,xb,d|m,xs,s|m,xs,d]':['从兄弟姐妹','从姐妹兄弟'],
'[f,xb,s|f,xb,d]':['堂兄弟姐妹','堂姐妹兄弟'],
'[m,xs,s|m,xs,d]':['姨兄弟姐妹','姨姐妹兄弟'],
'[f,xb,s|m,xs,s]':['从兄弟'],
'[f,xb,d|m,xs,d]':['从姐妹'],
'[f,xs,s|f,xs,d|m,xb,s|m,xb,d]':['表兄弟姐妹'],
'[f,xs,s|f,xs,d|m,xb,s|m,xb,d]':['表兄弟姐妹','表姐妹兄弟'],
'[f,xs,s|f,xs,d]':['姑表兄弟姐妹'],
'[m,xb,s|m,xb,d]':['舅表兄弟姐妹'],
'[f,xs,s|m,xb,s]':['表兄弟'],
@ -467,7 +467,7 @@
'f,f,xb,s,s&o':['从堂兄','再从父兄','再从兄','从祖兄'],
'f,f,xb,s,s&o,w':['从堂嫂','再从父嫂','再从嫂'],
'f,f,xb,s,s&l':['从堂弟','再从父弟','再从弟','从祖弟'],
'f,f,xb,s,s&l,w':['从堂弟媳','从堂弟媳','再从父弟媳'],
'f,f,xb,s,s&l,w':['从堂弟媳','从堂弟媳','再从父弟媳'],
'f,f,xb,s,s,s':['从堂侄','再从父侄男','再从子','族子'],
'f,f,xb,s,s,s,w':['从堂侄媳','再从父侄媳'],
'f,f,xb,s,s,s,s':['从堂侄孙','再从父侄孙'],
@ -818,7 +818,7 @@
'f,xb,s,d,d,h':['堂侄外孙婿','从父侄外孙婿','叔伯侄孙婿'],
'f,xb,d':['堂姐妹','从父姐妹','叔伯姐妹'],
'f,xb,d&o':['堂姐','堂阿姐','从父姐','叔伯姐','从姐'],
'f,xb,d&o,h':['堂姐夫','从父姐夫','从父姐','叔伯姐夫'],
'f,xb,d&o,h':['堂姐夫','从父姐夫','从父姐婿','叔伯姐夫'],
'f,xb,d&l':['堂妹','堂阿妹','从父妹','叔伯妹','从妹'],
'f,xb,d&l,h':['堂妹夫','从父妹夫','从父妹婿','叔伯妹夫'],
'f,xb,d,h,f':['从父姊妹姻父'],
@ -1094,8 +1094,8 @@
'm,f,xb,d,d,d':['堂舅表甥女','从父舅表甥女'],
'm,f,xb,d,d,d,h':['堂舅表甥婿','从父舅表甥婿'],
// 姑表*
'm,f,xs':['外姑婆','姑姥姥','姑外祖母','外姑祖母','外祖姑母','外太姑母','外姑婆'],
'm,f,xs,h':['外姑公','姑姥爷','姑外祖父','外姑祖父','外祖姑父','外太姑父','外姑公','外姑丈公','外丈公'],
'm,f,xs':['外姑婆','姑姥姥','姑外祖母','外姑祖母','外祖姑母','外太姑母'],
'm,f,xs,h':['外姑公','姑姥爷','姑外祖父','外姑祖父','外祖姑父','外太姑父','外姑丈公','外丈公'],
// 姑表舅表
'm,f,xs,s':['姑表舅父','姑表舅爸','姑表舅','姑表舅舅'],
'm,f,xs,s,w':['姑表舅母','姑表舅妈'],
@ -1263,7 +1263,7 @@
'm,m,xb,d,d,d,h':['舅表姨表甥婿'],
// 从母*
'm,m,xs':['外姨婆','姨外祖母','姨外婆','姨外奶','姨姥姥','姨姥','外姨祖母','从母姨外祖母'],
'm,m,xs,h':['外姨公','姨外祖父','姨外公','姨外','姨姥爷','外姨祖父','从母姨外祖父'],
'm,m,xs,h':['外姨公','姨外祖父','姨外公','姨外','姨姥爷','外姨祖父','从母姨外祖父'],
// 从母舅表
'm,m,xs,s':['姨舅父','姨舅爸','姨舅','从母舅父'],
'm,m,xs,s,w':['姨舅母','从母舅母'],
@ -1304,7 +1304,7 @@
'm,m,xs,d,d,d,h':['再从母甥婿'],
// 舅表
'm,xb':['舅舅','舅父','舅爸','舅爹','娘舅','母舅','舅','舅仔','阿舅','x舅'],
'm,xb,w':['舅妈','舅母','妗子','妗妗','妗妈','妗娘','妗母','阿妗','x舅妈'],
'm,xb,w':['舅妈','舅母','舅媳妇','妗子','妗妗','妗妈','妗娘','妗母','阿妗','x舅妈'],
'm,xb,w,f':['舅眷外祖父','舅眷王父','舅眷毑父','舅眷姥爷'],
'm,xb,w,m':['舅眷外祖母','舅眷王母','舅眷毑母','舅眷姥姥'],
'm,xb,w,xb':['舅眷舅父'],
@ -1390,14 +1390,14 @@
'm,xb,d,d,d':['舅表甥外孙女'],
'm,xb,d,d,d,h':['舅表甥外孙婿'],
'm,ob':['大舅','舅父'],
'm,ob,w':['大舅妈','大妗','大妗'],
'm,ob,w':['大舅妈','大妗'],
'm,lb':['小舅','舅仔','舅父仔','幺舅','老舅','细舅','满舅'],
'm,lb,w':['小舅妈','小妗','细妗'],
// 从母
'm,os':['大姨','大姨妈'],
'm,os,h':['大姨父','大姨丈'],
'm,os,h':['大姨父','大姨丈','大姨婿','大姨爸'],
'm,ls':['小姨','小姨妈','姨仔','幺姨','老姨','满姨','细姨'],
'm,ls,h':['小姨父','小姨丈'],
'm,ls,h':['小姨父','小姨丈','小姨婿','小姨爹'],
'm,xs':['姨妈','姨母','姨姨','姨娘','阿姨','姨','x姨','x姨妈'],
'm,xs,h':['姨丈','姨父','姨爸','姨爹','姨婿','姨郎','x姨丈','x姨父'],
'm,xs,h,f':['姨姻祖父','姨姻王父','姨姻爷爷'],
@ -1488,7 +1488,7 @@
'm,xs,d,d,d,h':['姨甥外孙婿','从母甥外孙婿'],
// 婆家
'h':['老公','丈夫','先生','官人','男人','汉子','夫','夫君','相公','夫婿','良人','老头子','爱人','老伴','那口子','配偶','伴侣','卿卿'],
'h,f':['公公','翁亲','家公','大官','老公公','老人公','公公','公爹','婆父','婆爹'],
'h,f':['公公','翁亲','家公','大官','老公公','老人公','公爹','婆父','婆爹'],
'h,f,f':['祖公','祖翁','奶公父'],
'h,f,f,f':['曾祖公','太公翁'],
'h,f,f,f,ob':['伯曾祖公','太伯翁'],
@ -1621,7 +1621,7 @@
'h,xb,d,d':['叔侄外孙女'],
'h,xb,d,d,h':['叔侄外孙婿'],
'h,os':['大姑子','大娘姑','大姑姐','夫姐','婆姐','婆婆姐'],
'h,os,h':['大姑夫','姊丈','大姑姐夫','婆姐夫','婆婆姐夫','大姑姐夫','大亘子'],
'h,os,h':['大姑夫','姊丈','大姑姐夫','婆姐夫','婆婆姐夫','大亘子'],
'h,ls':['小姑子','小姑妹','姑妹','夫妹'],
'h,ls,h':['小姑夫','小姑妹夫','小亘子'],
'h,xs,s':['姑甥男','夫甥男','姑男','婆家甥男','婆家甥子'],
@ -1934,7 +1934,7 @@
'xb,d,h,xb,w':['侄姻妇'],
'xb,d,h,xs':['侄姻女'],
'xb,d,h,xs,h':['侄姻婿'],
'xb,d,s':['侄外孙','侄外孙男','外侄孙','外孙男'],
'xb,d,s':['侄外孙','侄外孙男','外侄孙','孙男'],
'xb,d,s,w':['侄外孙媳','侄外孙妇','外侄孙媳','外侄孙妇'],
'xb,d,s,w,f':['侄外孙眷男','姻家侄'],
'xb,d,s,w,f,f&o':['侄外孙眷兄'],