updated 祖辈合称bug修复

This commit is contained in:
PASSER-BY 2022-05-11 22:23:17 +08:00
parent f3d00b642a
commit 77ff1d1658
3 changed files with 7 additions and 6 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -223,7 +223,7 @@
'[f,f|f,m|m,f],m,xb,w':['舅太奶奶','太舅奶奶'], '[f,f|f,m|m,f],m,xb,w':['舅太奶奶','太舅奶奶'],
'[f,f|f,m|m,f],m,xs':['姨太奶奶','太姨奶奶'], '[f,f|f,m|m,f],m,xs':['姨太奶奶','太姨奶奶'],
'[f,f|f,m|m,f],m,xs,h':['姨太奶爷','太姨奶爷'], '[f,f|f,m|m,f],m,xs,h':['姨太奶爷','太姨奶爷'],
'[f,m|m,f|m,m],f':['太姥爷','祖姥爷','太毑爷','太姥'], '[f,m|m,f|m,m],f':['太姥爷','祖姥爷','太毑爷'],
'[f,m|m,f|m,m],f,ob':['伯太姥爷','伯叔姥爷'], '[f,m|m,f|m,m],f,ob':['伯太姥爷','伯叔姥爷'],
'[f,m|m,f|m,m],f,ob,w':['伯太姥姥','太伯姥姥'], '[f,m|m,f|m,m],f,ob,w':['伯太姥姥','太伯姥姥'],
'[f,m|m,f|m,m],f,lb':['叔太姥爷','太叔姥爷'], '[f,m|m,f|m,m],f,lb':['叔太姥爷','太叔姥爷'],
@ -235,7 +235,8 @@
'[f,m|m,f|m,m],m,xb,w':['舅太姥姥','太舅姥姥'], '[f,m|m,f|m,m],m,xb,w':['舅太姥姥','太舅姥姥'],
'[f,m|m,f|m,m],m,xs':['姨太姥姥','太姨姥姥'], '[f,m|m,f|m,m],m,xs':['姨太姥姥','太姨姥姥'],
'[f,m|m,f|m,m],m,xs,h':['姨太姥爷','太姨姥爷'], '[f,m|m,f|m,m],m,xs,h':['姨太姥爷','太姨姥爷'],
'[f,m][f,m]':['祖辈'], '[f|m],[f|m],[f|m]':['曾祖辈','祖祖'],
'[f|m],[f|m]':['祖辈'],
'[f|m],f':['老爷'], '[f|m],f':['老爷'],
'[f|m],f,ob':['伯老爷'], '[f|m],f,ob':['伯老爷'],
'[f|m],f,ob,w':['伯老姥'], '[f|m],f,ob,w':['伯老姥'],
@ -962,8 +963,8 @@
'f,{G1W}':['祖母','婆','太?母','奶奶','奶'], 'f,{G1W}':['祖母','婆','太?母','奶奶','奶'],
'f,{G1W},h':['祖父','公','太?父','奶爷','爷爷','爷'], 'f,{G1W},h':['祖父','公','太?父','奶爷','爷爷','爷'],
'm,{G1M}':['外祖父','外公','外爷','外?公','外?祖父','外太?父','姥爷','姥公','毑公','毑爷','嘎公'], 'm,{G1M}':['外祖父','外公','外爷','外?公','外?祖父','外太?父','姥爷','姥公','毑公','毑爷','嘎公'],
'm,{G1M},w':['外祖母','外婆','外奶','外?婆','外?祖母','外太?母','姥姥','姥娘','姥婆','毑婆','毑毑','嘎嘎','嫏嫏','嫏娘'], 'm,{G1M},w':['外祖母','外婆','外奶','外?婆','外?祖母','外太?母','姥姥','姥娘','姥婆','毑婆','毑毑','嘎嘎','嫏嫏','嫏娘','姥'],
'm,{G1W}':['外祖母','外婆','外奶','外?婆','外?祖母','外太?母','姥姥','姥娘','姥婆','毑婆','毑毑','嘎嘎','嫏嫏','嫏娘'], 'm,{G1W}':['外祖母','外婆','外奶','外?婆','外?祖母','外太?母','姥姥','姥娘','姥婆','毑婆','毑毑','嘎嘎','嫏嫏','嫏娘','姥'],
'm,{G1W},h':['外祖父','外公','外爷','外?公','外?祖父','外太?父','姥爷','姥公','毑公','毑爷','嘎公'], 'm,{G1W},h':['外祖父','外公','外爷','外?公','外?祖父','外太?父','姥爷','姥公','毑公','毑爷','嘎公'],
// 父辈 // 父辈
'f,{G1},s&o':['伯父','伯伯','伯','大爷'], 'f,{G1},s&o':['伯父','伯伯','伯','大爷'],