updated 删除多余

src/branch.js

@@ -23,6 +23,8 @@ export default {
     '{G2C},s,s,d':['侄女'],
     '{G2C},s,d&o':['姐'],
     '{G2C},s,d&l':['妹'],
+    '{G2C},s,d,s':['甥男'],
+    '{G2C},s,d,d':['甥女'],
     '{G2C},d':['姑母'],
     '{G2C},d,h':['姑父'],
     '{G2C},d,s&o':['兄'],
@@ -31,6 +33,8 @@ export default {
     '{G2C},d,s,d':['侄女'],
     '{G2C},d,d&o':['姐'],
     '{G2C},d,d&l':['妹'],
+    '{G2C},d,d,s':['甥男'],
+    '{G2C},d,d,d':['甥女'],
     // 高祖以上
     'f,f,f,f,f,f,f,f,{G1M}':['鼻祖父'],
     'f,f,f,f,f,f,f,f,{G1M},w':['鼻祖母'],
@@ -570,9 +574,9 @@ export default {
     '{M0},[ob|lb]':['兄弟'],
     '{M0},[ob|lb],w':['兄弟妇'],
     '{M0},ob':['兄'],
-    '{M0},ob,w':['兄妇'],
+    '{M0},ob,w':['兄妇','兄嫂','嫂子'],
     '{M0},lb':['弟'],
-    '{M0},lb,w':['弟妇'],
+    '{M0},lb,w':['弟妇','弟妹'],
     '{M0},xb,s':['侄男','侄子','侄儿'],
     '{M0},xb,s,w':['侄妇'],
     '{M0},xb,d':['侄女'],
@@ -580,9 +584,9 @@ export default {
     '{M0},[os|ls]':['姊妹'],
     '{M0},[os|ls],h':['姊妹壻'],
     '{M0},os':['姊'],
-    '{M0},os,h':['姊壻'],
+    '{M0},os,h':['姊壻','姐夫'],
     '{M0},ls':['妹'],
-    '{M0},ls,h':['妹壻'],
+    '{M0},ls,h':['妹壻','妹夫'],
     '{M0},xs,s':['甥男'],
     '{M0},xs,s,w':['甥妇'],
     '{M0},xs,d':['甥女'],

src/main.js

@@ -150,16 +150,6 @@ export default {
     '[s,w|d,h],m,lb,w':['姻仁弟妇'],
     '[s,w|d,h],[f|m],f':['姻太翁'],
     '[s,w|d,h],[f|m],m':['姻太姆'],
-    '[xb,w|xs,h],xb':['亲家兄弟'],
-    '[xb,w|xs,h],ob,w':['亲家嫂子','亲家兄嫂'],
-    '[xb,w|xs,h],lb,w':['亲家弟嫂'],
-    '[xb,w|xs,h],xb,s':['亲家侄男'],
-    '[xb,w|xs,h],xb,d':['亲家侄女'],
-    '[xb,w|xs,h],xs':['亲家姊妹'],
-    '[xb,w|xs,h],os,h':['亲家姐夫'],
-    '[xb,w|xs,h],ls,h':['亲家妹夫'],
-    '[xb,w|xs,h],xs,s':['亲家甥男'],
-    '[xb,w|xs,h],xs,d':['亲家甥女'],
     // 主线
     'f,f,f,f,f,f,f,f,f,f,f,f':['先祖父','先太爷','十二世祖'],
     'f,f,f,f,f,f,f,f,f,f,f,m':['先祖母','先太奶'],