updated 添加重表数据等

src/branch.js

@@ -1,5 +1,37 @@
 // 分支关系链
 export default {
+    // 其他旁系
+    '{G2}':['祖父'],
+    '{G2},w':['祖母'],
+    '{G2},s':['父'],
+    '{G2},s,w':['母'],
+    '{G2},s,s&o':['兄'],
+    '{G2},s,s&l':['弟'],
+    '{G2},s,s':['兄弟'],
+    '{G2},s,d&o':['姊'],
+    '{G2},s,d&l':['妹'],
+    '{G2},s,d':['姊妹'],
+    '{G2},s,s,s':['男','子'],
+    '{G2},s,s,d':['女'],
+    '{G2C},s&o':['伯父'],
+    '{G2C},s&o,w':['伯母'],
+    '{G2C},s&l':['叔父'],
+    '{G2C},s&l,w':['叔母'],
+    '{G2C},s,s&o':['兄'],
+    '{G2C},s,s&l':['弟'],
+    '{G2C},s,s,s':['侄男'],
+    '{G2C},s,s,d':['侄女'],
+    '{G2C},s,d&o':['姐'],
+    '{G2C},s,d&l':['妹'],
+    '{G2C},d':['姑母'],
+    '{G2C},d,h':['姑父'],
+    '{G2C},d,s&o':['兄'],
+    '{G2C},d,s&l':['弟'],
+    '{G2C},d,s,s':['侄男'],
+    '{G2C},d,s,d':['侄女'],
+    '{G2C},d,d&o':['姐'],
+    '{G2C},d,d&l':['妹'],
+    // 高祖以上
     'f,f,f,f,f,f,f,f,{G1M}':['鼻祖父'],
     'f,f,f,f,f,f,f,f,{G1M},w':['鼻祖母'],
     'f,f,f,f,f,f,f,f,{G1W}':['鼻祖母'],
@@ -151,19 +183,6 @@ export default {
     '{G1},d,d,s,w':['甥外孙妇'],
     '{G1},d,d,d':['甥外孙女','外孙女'],
     '{G1},d,d,d,h':['甥外孙婿'],
-    // 其他旁系
-    '{G2}':['祖父'],
-    '{G2},w':['祖母'],
-    '{G2},[s&o|s&l]':['父'],
-    '{G2},[s&o|s&l],w':['母'],
-    '{G2},s,s&o':['兄'],
-    '{G2},s,s&l':['弟'],
-    '{G2},s,[s&o|s&l]':['兄弟'],
-    '{G2},s,d&o':['姊'],
-    '{G2},s,d&l':['妹'],
-    '{G2},s,[d&o|d&l]':['姊妹'],
-    '{G2},s,s,s':['男','子'],
-    '{G2},s,s,d':['女'],
     // 夫族
     'h,f,{G1M}':['祖公父','祖公','祖翁','奶公'],
     'h,f,{G1M},w':['祖婆母','祖婆','祖姆','奶婆'],
@@ -640,4 +659,4 @@ export default {
     '{M-2},xb,w':['孙妇'],
     '{M-2},xs':['孙女'],
     '{M-2},xs,h':['孙婿'],
-};
+};

src/main.js

@@ -373,9 +373,9 @@ export default {
     'w,xs,d,s':['姨甥外孙','姨外孙','姨外孙男','姨外孙男'],
     'w,xs,d,d':['姨甥外孙女','姨外孙女'],
     // 兄弟
-    'ob':['哥哥','哥','胞兄','亲哥','老哥','依哥','阿哥','家兄','兄长','大佬'],
+    'ob':['哥哥','哥','胞兄','亲哥','老哥','依哥','阿哥','家兄','兄长','大佬','元兄','长兄'],
     'ob,w':['嫂子','嫂','嫂嫂','阿嫂','家嫂','兄姊','兄嫂','兄妇','兄妻'],
-    'lb':['弟弟','弟','胞弟','亲弟','老弟','阿弟','细佬','依弟','小弟','幺弟','细弟','满弟'],
+    'lb':['弟弟','弟','胞弟','亲弟','老弟','阿弟','细佬','依弟','小弟','幺弟','细弟','满弟','幼弟'],
     'lb,w':['弟妹','弟媳','弟媳妇','弟媳妇子','弟新妇','老弟嫂'],
     '1,xb,w,xb':['叔眷兄弟'],
     '1,xb,w,xb,s':['叔眷舅男'],
@@ -401,9 +401,9 @@ export default {
     '1,xb,d':['从女','从子'],
     '1,xb,d,h':['从婿'],
     // 姐妹
-    'os':['姐姐','姐','胞姐','亲姐','阿姐','阿姊','姊仔','家姐','依姐'],
+    'os':['姐姐','姐','胞姐','亲姐','阿姐','阿姊','姊仔','家姐','依姐','长姐'],
     'os,h':['姐夫','姐丈','姐婿','姐郎','姊兄','姐夫哥','胞姐夫'],
-    'ls':['妹妹','妹','胞妹','亲妹','阿妹','妹儿','妹子','依妹','幺妹','细妹','满妹'],
+    'ls':['妹妹','妹','胞妹','亲妹','阿妹','妹儿','妹子','依妹','幺妹','细妹','满妹','幼妹'],
     'ls,h':['妹夫','妹丈','妹婿','妹郎','妹弟','妹夫子','胞妹夫'],
     '1,xs,h,xb':['姑姻兄弟'],
     '1,xs,h,xb,s':['姑姻叔男'],

src/method.js

@@ -51,6 +51,7 @@ export function getSelectors(str){
         '^眷':['叔眷','舅眷','兄弟眷','男眷'],
         '^亲家':['姊妹姻','兄弟眷'],
         '^([堂表姨]?)([曾高天烈太远鼻]?)(祖?)([伯叔姑舅姨])':['$1$4$2$3'],
+        '^([曾高天烈太远鼻]?)祖?王姑':['姑$1祖母'],
         '^([曾玄来晜仍云耳])([侄甥])':['$2$1'],
         '^外表([伯叔姑舅姨])':['姑表$1外','舅表$1外'],
         '^([堂表姨]?)外甥':['$1甥'],
@@ -140,6 +141,9 @@ export function getSelectors(str){
 export function selector2id(selector,sex){
     var result = [];
     var hash = {};
+    if(!selector.match(/^,/)){
+        selector = ','+selector;
+    }
     //性别判断
     if(sex<0){
         if(selector.match(/^,[w1]/)){

src/prefix.js

@@ -1,5 +1,16 @@
 // 分支前缀
-export default {
+import {
+    selector2id
+} from './method';
+// 合并写法
+var prefixMap = {
+    '{G2C}':{
+        '[f|m],[f|m],[f|m],[f,xs|m,xb|m,xs],[s|d],[s|d]':['重表'], // 曾祖辈的表兄弟姐妹的子女
+        '[f|m],[f|m],[f,xs|m,xb|m,xs],[s|d]':['重表'], // 祖辈的表兄弟姐妹的子女
+    },
+};
+// 分解写法
+var prefix = {
     '{G2}':{
         'f,f,xb':['从祖'],
         'm,f,xb':['外从祖'],
@@ -191,4 +202,18 @@ export default {
         'w,xs,d,s,w':['姨甥外孙眷','姨外孙眷'],
         'w,xs,d,d,h':['姨甥外孙姻','姨外孙姻'],
     }
-};
+};
+
+for(var key in prefixMap){
+    for(var selector in prefixMap[key]){
+        var ids = selector2id(selector);
+        if(typeof prefix[key]=='undefined'){
+            prefix[key] = {};
+        }
+        ids.forEach(function(id){
+            prefix[key][id] = prefixMap[key][selector];
+        });
+    }
+}
+
+export default prefix;