updated 部分别称添加

script/relationship.js

@@ -277,7 +277,7 @@
         'xb,[s|d]':['侄子女','侄子侄女'],
         'xs,[s|d]':['甥子女','外甥子女'],
         '[w|s|d]':['妻儿'],
-        '[s|d]':['子女','儿女','小孩','孩子','孩子们','孩儿','小孩儿','宝宝','宝贝','娃','儿辈','子辈'],
+        '[s|d]':['子女','儿女','小孩','孩子','孩子们','孩儿','小孩儿','宝宝','宝贝','娃','儿辈','子辈','崽','幺儿'],
         '[s|d],[s|d]':['孙辈'],
         's,[s|d]':['孙子女'],
         'd,[s|d]':['外孙子女'],
@@ -317,7 +317,7 @@
         'm,m,m,m':['外曾外曾外祖母','高毑母'],
         // 曾祖辈
         'f,f,f':['曾祖父','曾祖','外曾外毑父','太公','太爷','祖爷','太翁','太爷爷','三世祖'],
-        'f,f,m':['曾祖母','外曾外毑母','太婆','太奶','太嬷','太姆','太奶奶'],
+        'f,f,m':['曾祖母','外曾外毑母','太婆','太奶','太嬷','太姆','太奶奶','老娭毑'],
         'f,m,f':['曾外祖父','曾外祖','外曾毑父','太外公','太外爷','太外翁','太外爷爷'],
         'f,m,m':['曾外祖母','外曾毑母','太外婆','太外奶','太外姆','太外奶奶'],
         'm,f,f':['外曾祖父','外曾祖','曾外毑父','外太公','外太爷','外太翁','外太爷爷','老外公','老外爷','老姥爷'],
@@ -328,9 +328,9 @@
         'f,f,f,xb,w':['族曾祖母'],
         // 祖父辈
         'f,f':['爷爷','祖父','奶爷','阿爷','阿公','嗲嗲','二世祖'],
-        'f,m':['奶奶','祖母','阿嬷','阿嫲','嫲嫲','婻婻'],
+        'f,m':['奶奶','祖母','阿嬷','阿嫲','嫲嫲','婻婻','娭毑'],
-        'm,f':['外公','外祖父','姥爷','阿公','客公','外爷','舅家爷','毑父','毑爷'],
+        'm,f':['外公','外祖父','姥爷','阿公','客公','外爷','舅家爷','毑父','毑爷','嘎公'],
-        'm,m':['外婆','外祖母','姥姥','姥娘','阿婆','阿嬷','阿嫲','嫲嫲','外奶','客婆','舅家婆','毑母','毑毑'],
+        'm,m':['外婆','外祖母','姥姥','姥娘','姥婆','毑婆','阿婆','阿嬷','阿嫲','嫲嫲','外奶','客婆','舅家婆','毑母','毑毑','嘎嘎'],
         'f,f,ob':['伯公','伯祖','伯翁','伯爷','伯祖父','伯老爷','大爷爷','大爷','大公','伯爷爷','大伯公','大阿爷','x伯公','x阿爷'],
         'f,f,ob,w':['伯婆','伯祖母','伯奶奶','大奶奶','姆婆'],
         'f,f,lb':['叔公','叔祖','叔翁','叔爷','叔祖父','叔老爷','小爷爷','叔爷爷','叔奶爷','晚公','x叔公'],
@@ -342,7 +342,7 @@
         'f,m,xb':['舅公','舅祖父','舅老爷','舅爷爷','舅爷','舅祖','舅奶爷','舅爹','太舅父','x舅老爷','x舅公'],
         'f,m,xb,w':['舅婆','舅祖母','舅奶奶','舅奶','妗婆','妗奶','太舅母','x舅婆'],
         'f,m,xs':['姨奶奶','祖姨母','姨祖母','姨婆','姨奶','x姨奶'],
-        'f,m,xs,h':['姨爷爷','祖姨父','姨祖父','姨公','姨丈公','姨爷','姨老爷','姨奶爷'],
+        'f,m,xs,h':['姨爷爷','祖姨父','姨祖父','姨公','姨公公','姨丈公','姨爷','姨老爷','姨奶爷'],
         'm,f,ob':['外伯公','伯外祖父','外伯祖父','伯姥爷','外伯祖','伯外祖','大外公','大姥爷','大外爷'],
         'm,f,ob,w':['外伯婆','伯外祖母','外伯祖母','伯姥姥','外姆婆','大外婆','大姥姥','大姥奶'],
         'm,f,lb':['外叔公','叔外祖父','外叔祖父','叔姥爷','外叔祖','叔外祖','小外公','小姥爷','小外爷'],
@@ -353,18 +353,18 @@
         'm,f,xs,h':['外姑公','姑姥爷','姑外祖父','外姑祖父','外祖姑父','外太姑父','外姑丈公','外丈公','x姑姥爷'],
         'm,m,xb':['外舅公','外舅祖父','外太舅父','舅外祖父','外祖舅父','舅外公','舅外爷','舅姥爷','舅爹','舅公','x舅姥爷'],
         'm,m,xb,w':['外舅婆','外舅祖母','外太舅母','舅外祖母','外祖舅母','舅外婆','舅外奶','舅姥姥','舅姥','舅婆','妗姥姥','妗姥娘','妗姥','外妗婆','x舅姥姥'],
-        'm,m,xs':['外姨婆','姨外祖母','姨外婆','姨外奶','姨姥姥','姨姥','外姨祖母','从母外祖母','x姨姥姥'],
+        'm,m,xs':['外姨婆','姨外祖母','姨外婆','姨外奶','姨姥姥','姨姥','外姨祖母','从母外祖母','姨家家','x姨姥姥'],
         'm,m,xs,h':['外姨公','姨外祖父','姨外公','姨外爷','姨姥爷','外姨祖父','从母外祖父','x姨姥爷'],
         // 父辈
-        'f':['爸爸','父亲','老爸','阿爸','阿爹','老窦','老汉','老汉儿','老子','爸','父','爹','爹爹','爹地','爹啲','老爹','老爷子','一世祖'],
+        'f':['爸爸','父亲','老爸','阿爸','阿爹','老窦','老汉','老汉儿','老子','牙老子','牙老倌','爸','父','爹','爹爹','爹地','爹啲','老爹','老爷子','一世祖'],
-        'm':['妈妈','母亲','阿妈','老母','老妈','老娘','老妈子','妈子','姆嬷','姆妈','妈','母','娘','娘亲','妈咪'],
+        'm':['妈妈','母亲','阿妈','老母','老妈','老娘','老妈子','妈子','娘老子','姆嬷','姆妈','妈','母','娘','娘亲','妈咪'],
         'f,ob':['伯父','伯伯','阿伯','大伯','大伯爷','大大','世父','大爹','大爸','x伯'],
         'f,ob,w':['伯母','伯妈','伯娘','姆姆','姆','世母','大娘','大妈','x伯母','x妈'],
         'f,lb':['叔叔','叔父','叔爸','叔爹','阿叔','仲父','季父','小叔','小爹','小爸','尕爸','幺爸','幺爹','幺叔','细叔','满叔','晚叔','叔','x叔'],
         'f,lb,w':['婶婶','婶母','婶娘','婶妈','婶爹','阿婶','仲母','季母','小婶','小娘','小妈','尕婶','幺婶','细婶','满婶','晚婆','小婶娘','婶子','婶儿','家婶','叔母','叔妈','叔娘','婶','x叔母','x婶'],
         'f,os':['大姑','大姑妈','姑姊'],
         'f,ls':['小姑','小姑妈','姑姐','姑妹','姑仔','尕娘','幺姑','幺姑姐','老姑','细姑','满姑'],
-        'f,xs':['姑妈','姑母','姑姑','嬢嬢','娘娘','姑','x嬢嬢','x嬢','x姑妈','x姑'],
+        'f,xs':['姑妈','姑母','姑姑','嬢嬢','娘娘','姑','阿姑','x嬢嬢','x嬢','x姑妈','x姑'],
         'f,xs,h':['姑丈','姑父','姑爸','姑爹','姑夫','姑婿','亘','x姑丈','x姑父'],
         'm,ob':['大舅','舅父'],
         'm,ob,w':['大舅妈','大妗'],
@@ -449,22 +449,22 @@
         'w,m,f,m':['外曾祖岳母','外曾祖丈母','太奶丈母娘','祖姥丈母娘','太姥丈母娘'],
         'w,m,m,f':['外曾外祖岳父','外曾外祖丈人','祖姥爷丈人','太姥爷丈人'],
         'w,m,m,m':['外曾外祖岳母','外曾外祖丈母','外曾外祖丈母娘','祖姥丈母娘','太姥丈母娘'],
-        'w,f,f':['祖岳父','太岳父','奶岳父','祖丈人','爷丈人','奶爷丈人'],
+        'w,f,f':['祖岳父','太岳父','奶岳父','祖丈人','爷丈人','奶爷丈人','奶丈爷','奶丈人','老丈爷'],
-        'w,f,m':['祖岳母','太岳母','奶岳母','祖丈母','祖丈母娘','奶丈母娘','奶丈母'],
+        'w,f,m':['祖岳母','太岳母','奶岳母','祖丈母','祖丈母娘','奶丈母娘','奶丈姥','奶丈母','老丈姥'],
-        'w,m,f':['外祖岳父','外祖丈人','外太岳父','姥岳父','姥丈人','姥爷丈人'],
+        'w,m,f':['外祖岳父','外祖丈人','外太岳父','姥岳父','姥丈爷','姥丈人','姥爷丈人','老丈爷'],
-        'w,m,m':['外祖岳母','外祖丈母娘','外祖丈母','外太岳母','姥岳母','姥丈母','姥丈母娘'],
+        'w,m,m':['外祖岳母','外祖丈母娘','外祖丈母','外太岳母','姥岳母','姥丈姥','姥丈母','姥丈母娘'],
-        'w,f':['岳父','岳丈','老丈人','丈人爹','岳翁','丈人','丈父','内父','外父','妻父','泰山','外舅','老亲爷'],
+        'w,f':['岳父','岳丈','岳老子','老干爷','老丈人','丈母爷','老丈杆子','丈人爹','丈爷爹','岳翁','丈人','丈父','丈爷','外父','妻父','泰山','外舅','老亲爷'],
-        'w,m':['岳母','丈母娘','老丈母','丈人娘','丈母','内母','外母','妻母','泰水','外姑','老亲娘'],
+        'w,m':['岳母','丈母娘','丈姥娘','岳母娘','老干娘','老丈母','丈人娘','丈母','丈姥','外母','泰水','外姑','老亲娘'],
         'w':['老婆','妻子','太太','媳妇儿','媳妇','夫人','女人','婆娘','妻','内人','内子','娘子','爱妻','老太婆','老婆子','爱人','老伴','那口子','配偶','伴侣','卿卿'],
-        'w,ob':['大舅子','大舅兄','妻兄','内兄','岳兄','舅兄'],
+        'w,ob':['大舅子','大舅兄','舅兄'],
         'w,ob,w':['大舅妇','大舅兄嫂','舅嫂','大舅嫂','大舅姐','大舅媳妇','大妗子','妻嫂','内嫂','妻兄妇','内兄妇','岳兄妇','舅兄妇'],
-        'w,lb':['小舅子','小舅弟','妻弟','内弟','岳弟','舅弟'],
+        'w,lb':['小舅子','小舅弟','舅弟'],
         'w,lb,w':['小舅妇','小舅弟妇','舅弟媳','小舅妹','小舅媳妇','小妗子','妻妹夫','内妹夫','妻弟妇','内弟妇','岳弟妇','舅弟妇'],
         'w,xb':['妻舅'],
         'w,xb,w':['妻妗'],
-        'w,os':['大姨子','大姨姐','妻姐','内姐'],
+        'w,os':['大姨子','大姨姐'],
         'w,os,h':['大姨夫','大姨姐夫','襟兄','大尹子'],
-        'w,ls':['小姨子','小姨妹','妻妹','内妹','小妹儿'],
+        'w,ls':['小姨子','小姨妹','小妹儿','姨妹子'],
         'w,ls,h':['小姨夫','小姨妹夫','襟弟','小尹子'],
         'w,xs':['妻姨'],
         'w,xs,h':['连襟','连桥','姨夫','姨夫爷','一担挑','老挑','担儿挑','连襟儿','妻尹'],
@@ -505,7 +505,7 @@
         '0,xs,d':['姨甥女','姨甥'],
         '0,xs,d,h':['姨甥婿'],
         'xs,s':['外甥','外甥男','外甥儿','外甥子','外甥儿子'],
-        'xs,d':['外甥女','外甥囡'],
+        'xs,d':['外甥女','外甥囡','外甥女儿','外甥闺女'],
         // 堂表亲
         'f,xb,s,s':['堂侄','堂侄子','堂侄儿','堂侄男','从父侄男','叔伯侄男','从父侄子','叔伯侄子','从子'],
         'f,xb,s,s,w':['堂侄媳妇','堂侄妇','从父侄妇','叔伯侄妇'],
@@ -513,7 +513,7 @@
         'f,xb,d,s,w':['堂甥媳妇','堂甥妇','从父甥妇','叔伯甥妇'],
         // 子辈
         's':['儿子','男儿','息男','闺男','囝囝','囝男','小子','男亲','长子','次子','幼子','儿','仔','子','阿仔','仔仔','x儿子','一世孙'],
-        's,w':['儿媳','儿媳妇','新妇','心抱','息妇','x儿媳'],
+        's,w':['儿媳','儿媳妇','儿媳妇儿','新妇','心抱','息妇','x儿媳'],
         's,s':['孙子','孙男','孙男儿','孙儿','大孙子','x孙子','二世孙'],
         's,s,w':['孙媳妇','孙媳','孙妇','孙息妇','孙新妇','x孙媳'],
         's,s,s':['曾孙','曾孙男','重孙','重孙子','息仔','三世孙'],
@@ -581,7 +581,7 @@
         's,d,d,s,w':['曾外曾外孙媳妇'],
         's,d,d,d':['曾外曾外孙女'],
         's,d,d,d,h':['曾外曾外孙女婿'],
-        'd':['女儿','千金','掌上明珠','息女','闺女','囡女','乖囡','囡囡','丫头','姑娘','女亲','长女','次女','幼女','女','阿女','女女','x女儿'],
+        'd':['女儿','千金','掌上明珠','息女','闺女','囡女','乖囡','囡囡','丫头','姑娘','妮子','女亲','长女','次女','幼女','女','阿女','女女','x女儿'],
         'd,h':['女婿','姑爷','女婿子','女婿儿','儿婿','子婿','息婿','囝婿','x女婿'],
         'd,s':['外孙','外孙儿'],
         'd,s,w':['外孙媳妇','外孙妇','外孙新妇'],
@@ -597,7 +597,7 @@
         'd,s,d,s,w':['外玄外孙媳妇'],
         'd,s,d,d':['外玄外孙女'],
         'd,s,d,d,h':['外玄外孙女婿'],
-        'd,d':['外孙女','外孙囡'],
+        'd,d':['外孙女','外孙囡','外孙女儿'],
         'd,d,h':['外孙女婿','外孙婿'],
         'd,d,s':['外曾外孙'],
         'd,d,s,w':['外曾外孙媳妇'],
@@ -812,8 +812,8 @@
         'f,{G1W}':['婆','祖母','奶奶','奶'],
         'f,{G1W},h':['公','祖父','奶爷','爷'],
         'm,{G1M}':['外?公','外祖父','姥爷'],
-        'm,{G1M},w':['外?婆','外祖母','姥姥'],
+        'm,{G1M},w':['外?婆','外祖母','姥姥','姥娘','姥婆','毑婆'],
-        'm,{G1W}':['外?婆','外祖母','姥姥'],
+        'm,{G1W}':['外?婆','外祖母','姥姥','姥娘','姥婆','毑婆'],
         'm,{G1W},h':['外?公','外祖父','姥爷'],
         'f,{G1},s&o':['伯父','伯伯','伯'],
         'f,{G1},s&o,w':['伯母'],
@@ -1406,10 +1406,7 @@
                 sid = sid.substring(0,sid.lastIndexOf(','));
                 var id_arr = id.split(',').reverse();
                 var sid_arr = sid.split(',').reverse();
-                var arr = [];
+                var arr = id_arr.map((id,i)=>hash[id][sid_arr[i]]);
-                for(var i=0;i<id_arr.length;i++){
-                    arr.push(hash[id_arr[i]][sid_arr[i]]);
-                }
                 var g = 0;
                 var gMap = {'f':1,'m':1,'s':-1,'d':-1};
                 arr.forEach(function(r){