updated '族'的定义错误修复
This commit is contained in:
parent
00d649b9c9
commit
6e57805bc9
2
dist/relationship.min.js
vendored
2
dist/relationship.min.js
vendored
File diff suppressed because one or more lines are too long
2
dist/relationship.zh-HK.min.js
vendored
2
dist/relationship.zh-HK.min.js
vendored
File diff suppressed because one or more lines are too long
@ -544,9 +544,9 @@
|
|||||||
'xb,s,w':['侄媳妇','侄嫂'],
|
'xb,s,w':['侄媳妇','侄嫂'],
|
||||||
'xb,d':['侄女','侄囡','侄女儿','侄闺女'],
|
'xb,d':['侄女','侄囡','侄女儿','侄闺女'],
|
||||||
// 姐妹
|
// 姐妹
|
||||||
'os':['姐姐','姐','阿姊','胞姐','阿姐','大姐','家姐'],
|
'os':['姐姐','姐','阿姊','胞姐','阿姐','家姐'],
|
||||||
'os,h':['姐夫','姐丈','姐婿','姐郎','姊兄','姐夫哥','胞姐夫'],
|
'os,h':['姐夫','姐丈','姐婿','姐郎','姊兄','姐夫哥','胞姐夫'],
|
||||||
'ls':['妹妹','妹','胞妹','老妹','阿妹','小妹','幺妹','细妹','满妹'],
|
'ls':['妹妹','妹','胞妹','老妹','阿妹','幺妹','细妹','满妹'],
|
||||||
'ls,h':['妹夫','妹丈','妹婿','妹郎','妹弟','妹夫子','胞妹夫'],
|
'ls,h':['妹夫','妹丈','妹婿','妹郎','妹弟','妹夫子','胞妹夫'],
|
||||||
'0,xs,h,xb,s':['姨姻叔男'],
|
'0,xs,h,xb,s':['姨姻叔男'],
|
||||||
'1,xs,h,xb,s':['姑姻叔男'],
|
'1,xs,h,xb,s':['姑姻叔男'],
|
||||||
@ -682,9 +682,6 @@
|
|||||||
*/
|
*/
|
||||||
// 分支前缀
|
// 分支前缀
|
||||||
var _prefix = {
|
var _prefix = {
|
||||||
'{G3}':{
|
|
||||||
'f,f,f,xb':['族'],
|
|
||||||
},
|
|
||||||
'{G2}':{
|
'{G2}':{
|
||||||
'f,f,xb':['从祖'],
|
'f,f,xb':['从祖'],
|
||||||
'm,f,xb':['外从祖'],
|
'm,f,xb':['外从祖'],
|
||||||
@ -710,7 +707,7 @@
|
|||||||
'm,m,xb,d':['舅表姨表'],
|
'm,m,xb,d':['舅表姨表'],
|
||||||
'm,m,xs,s':['从母舅表'],
|
'm,m,xs,s':['从母舅表'],
|
||||||
'm,m,xs,d':['再从母','姨姨','再从'],
|
'm,m,xs,d':['再从母','姨姨','再从'],
|
||||||
'f,f,f,xb,s,s':['三从父','再从堂','三从'],
|
'f,f,f,xb,s,s':['三从父','再从堂','族','三从'],
|
||||||
'm,m,m,xs,d,d':['三从母','三从'],
|
'm,m,m,xs,d,d':['三从母','三从'],
|
||||||
'f,f,f,f,xb,s,s,s':['四从父','三从堂','四从'],
|
'f,f,f,f,xb,s,s,s':['四从父','三从堂','四从'],
|
||||||
'm,m,m,m,xs,d,d,d':['四从母','四从'],
|
'm,m,m,m,xs,d,d,d':['四从母','四从'],
|
||||||
@ -723,6 +720,7 @@
|
|||||||
'f,f,xb,s&l':['堂叔','从父叔','叔伯叔','从叔'],
|
'f,f,xb,s&l':['堂叔','从父叔','叔伯叔','从叔'],
|
||||||
'f,f,f,xb,s,s&o':['从堂伯'],
|
'f,f,f,xb,s,s&o':['从堂伯'],
|
||||||
'f,f,f,xb,s,s&l':['从堂叔'],
|
'f,f,f,xb,s,s&l':['从堂叔'],
|
||||||
|
'f,f,f,xb,s,s':['族'],
|
||||||
'f,f,xs,s&o':['姑表伯'],
|
'f,f,xs,s&o':['姑表伯'],
|
||||||
'f,f,xs,s&l':['姑表叔'],
|
'f,f,xs,s&l':['姑表叔'],
|
||||||
'f,m,xb,s&o':['舅表伯'],
|
'f,m,xb,s&o':['舅表伯'],
|
||||||
@ -968,20 +966,6 @@
|
|||||||
'{G1},d,d,d':['甥外孙女'],
|
'{G1},d,d,d':['甥外孙女'],
|
||||||
'{G1},d,d,d,h':['甥外孙婿'],
|
'{G1},d,d,d,h':['甥外孙婿'],
|
||||||
// 其他旁系
|
// 其他旁系
|
||||||
'{G3}':['曾祖父'],
|
|
||||||
'{G3},w':['曾祖母'],
|
|
||||||
'{G3},s':['祖父'],
|
|
||||||
'{G3},s,w':['祖母'],
|
|
||||||
'{G3},s,s':['父'],
|
|
||||||
'{G3},s,s,w':['母'],
|
|
||||||
'{G3},s,s,s&o':['兄'],
|
|
||||||
'{G3},s,s,s&l':['弟'],
|
|
||||||
'{G3},s,s,[s&o|s&l]':['兄弟'],
|
|
||||||
'{G3},s,s,d&o':['姊'],
|
|
||||||
'{G3},s,s,d&l':['妹'],
|
|
||||||
'{G3},s,s,[d&o|d&l]':['姊妹'],
|
|
||||||
'{G3},s,s,s,s':['男','子'],
|
|
||||||
'{G3},s,s,s,d':['女'],
|
|
||||||
'{G2}':['祖父'],
|
'{G2}':['祖父'],
|
||||||
'{G2},w':['祖母'],
|
'{G2},w':['祖母'],
|
||||||
'{G2},s':['父'],
|
'{G2},s':['父'],
|
||||||
|
Loading…
x
Reference in New Issue
Block a user