updated 添加别称及内兄、内弟计算异常修复

修复无法计算内兄内弟等称呼问题

src/module/data/main.js

@@ -52,16 +52,16 @@ export default {
     'm,f':['外公','外祖父','姥爷','阿公','外爷','客公','毑父','毑公','姥公','舅家爷','嘎公','嘎爹',,'嘎嘎爹','嘎爷爷','尕公','毑爹','毑爷','外大父','姥爹'],
     'm,m':['外婆','外祖母','姥姥','阿婆','外奶','客婆','毑母','毑婆','姥婆','舅家婆','嘎嘎','嘎婆','嘎嘎婆','嘎奶奶','尕婆','毑娘','毑毑','外大母','姥娘','阿嬷','阿嫲','外嬷','嫲嫲','好婆','嫏嫏','嫏娘'],
     'f,f,ob':['伯公','伯祖','伯翁','大爷爷','大嗲','大爷','大公','大阿爷'],
-    'f,f,ob,w':['伯婆','姆婆','大奶奶'],
+    'f,f,ob,w':['伯婆','姆婆','大奶奶','伯娭毑'],
     'f,f,lb':['叔公','叔祖','叔翁','小爷爷','晚公','幺爷','细嗲'],
-    'f,f,lb,w':['叔婆','婶婆','小奶奶','晚婆','幺奶'],
+    'f,f,lb,w':['叔婆','婶婆','小奶奶','叔娭毑','晚婆','幺奶'],
     'f,f,xb':['伯叔祖父','从祖父','几爷爷','几大爷','几嗲','几爷','几公'],
     'f,f,xb,w':['伯叔祖母','从祖母','几奶奶','几大娘','几奶','几婆'],
-    'f,f,xs':['姑奶奶','祖姑','恩婆'],
-    'f,f,xs,h':['姑爷爷','姑公公','恩爹','祖姑丈','姑丈公','丈公'],
+    'f,f,xs':['姑奶奶','祖姑','姑奶','恩婆','姑娭毑'],
+    'f,f,xs,h':['姑爷爷','祖姑丈','恩爹','姑丈公','丈公'],
     'f,m,xb':['舅爷爷','舅祖','舅爹','太舅父'],
     'f,m,xb,w':['舅奶奶','妗婆','舅婆','妗奶','太舅母'],
-    'f,m,xs':['姨奶奶','姨奶'],
+    'f,m,xs':['姨奶奶','姨奶','姨娭毑'],
     'f,m,xs,h':['姨爷爷','姨公公','姨爹','姨丈公','丈公'],
     'm,f,ob':['伯外公','外伯祖','伯外祖','大外公','大姥爷','大外爷'],
     'm,f,ob,w':['伯外婆','外姆婆','大外婆','大姥姥','大姥奶'],
@@ -156,7 +156,7 @@ export default {
     'm,ob,w':['大舅妈','大妗','舅嫲'],
     'm,lb':['小舅','小舅舅','舅仔','舅父仔','尕阿舅','老舅'],
     'm,lb,w':['小舅妈','小妗','细妗'],
-    'm,xb':['舅舅','舅爸','舅父','舅爹','娘舅','母舅','阿舅','妗公','几舅','舅'],
+    'm,xb':['舅舅','舅爸','舅父','舅爹','娘舅','母舅','阿舅','妗公','舅台','几舅','舅'],
     'm,xb,w':['舅妈','舅母','舅娘','娘妗','舅妻','舅姆','舅姆妈','舅媳妇','舅妇','舅姥','老妗','妗子','妗妗','妗妈','妗娘','妗母','阿妗','妗门','妗婆仔','妗儿妈','妗','嬢嬢'],
     'm,os':['大姨','大姨妈','姨嬷'],
     'm,os,h':['大姨丈','大姨父','大姨爸','姨伯'],
@@ -237,7 +237,7 @@ export default {
     'w,f,f,xb,s&l,w':['姻婶'],
     'w,m,f':['外祖岳父','毑岳父','外祖丈人爹','外祖丈人','外太岳父','姥岳父','姥丈爷','姥丈人','姥丈人爹','老丈爷','姥爷丈人'],
     'w,m,m':['外祖岳母','毑岳母','外祖丈母娘','外祖丈母','外太岳母','姥岳母','姥丈姥','姥丈母','姥丈母娘','老丈娘'],
-    'w,f':['岳父','丈人','老丈人','外父','泰山','外舅','老亲爷','丈人爹','老干爷','丈人公','丈母爷','丈爷','丈爷爹','丈父','岳老子','老丈杆子','岳丈','岳翁','妇翁','家岳'],
+    'w,f':['岳父','丈人','老丈人','外父','泰山','外舅','老亲爷','丈人爹','老干爷','丈人公','丈母爷','丈爷','丈爷爹','丈父','岳老子','老丈杆子','岳丈','岳翁','妻公','妇翁','冰翁'],
     'w,m':['岳母','丈母','老丈母','外母','泰水','外姑','老亲娘','丈人娘','老干娘','丈人婆','丈母娘','丈姥','丈姥娘','丈姆','岳母娘','丈母婆','丈姆婆','丈姆娘'],
     'w':['老婆','妻子','媳妇','媳妇儿','太太','妻','女人','新娘','爱姥','妻亲','娘子','新娘子','夫人','婆娘','老太婆','内人','内子','内助','贤内助','爱妻','发妻','婆姨','婆子','老婆子','老婆儿','老婆仔','堂客','爱人','老伴','那口子','配偶','伴侣','伉俪','卿卿'],
     'w,ob':['大舅子','大舅哥','大舅佬','大阿舅','丈人兄','舅哥'],

src/module/data/multiple.js

@@ -90,7 +90,7 @@ export default {
     'w,m,[xs|xs,h]':['姨岳父母'],
     'w,[f,xs|m,xb],d':['姑舅姨子'],
     'w,[f,xs|m,xb],d,h':['姑舅连襟','姑舅连桥'],
-    'h,[f|m]':['公婆','翁姑','姑翁','大家官','公公婆婆','姑嫜'],
+    'h,[f|m]':['公婆','翁姑','姑翁','姑舅','大家官','公公婆婆','姑章','姑嫜'],
     'h,f,[ob|ob,w]':['伯公婆'],
     'h,f,[lb|lb,w]':['叔公婆'],
     'h,f,[xs|xs,h]':['姑公婆'],

src/module/map.js

@@ -80,10 +80,12 @@ for(let key in _map){
     if(key.match(/^[fm]/)||key.match(/^[olx][bs]$|^[olx][bs],[^mf]/)){      // 只对长辈或者兄弟辈匹配
         for(let k in branch){
             let newKey = k+','+key;
+            if(key.match(/[fm]/)){
                 let newKey_x = newKey.replace(/,[ol]([sb])(,[wh])?$/,',x$1$2').replace(/(,[sd])&[ol](,[wh])?$/,'$1$2');
                 if(newKey_x!=newKey&&_map[newKey_x]){       // 不扩大解释年龄
                     continue;
                 }
+            }
             if(!_map[newKey]){
                 _map[newKey] = [];
             }