updated 部分称呼去冗

src/branch.js

@@ -354,8 +354,8 @@ export default {
     '{M1W},xb':['舅父'],
     '{M1W},xb,w':['舅母'],
     '{M1W},xb,[s|d]':['舅表兄弟姊妹'],
-    '{M1W},xb,[s&o|s&l]':['舅表兄弟'],
+    '{M1W},xb,s':['舅表兄弟'],
-    '{M1W},xb,[s&o|s&l],w':['舅表兄弟妇'],
+    '{M1W},xb,s,w':['舅表兄弟妇'],
     '{M1W},xb,s&o':['舅表兄'],
     '{M1W},xb,s&o,w':['舅表兄妇'],
     '{M1W},xb,s&l':['舅表弟'],
@@ -364,8 +364,8 @@ export default {
     '{M1W},xb,s,s,w':['舅表侄妇','侄妇'],
     '{M1W},xb,s,d':['舅表侄女','侄女'],
     '{M1W},xb,s,d,h':['舅表侄婿','侄婿'],
-    '{M1W},xb,[d&o|d&l]':['舅表姊妹'],
+    '{M1W},xb,d':['舅表姊妹'],
-    '{M1W},xb,[d&o|d&l],h':['舅表姊妹壻'],
+    '{M1W},xb,d,h':['舅表姊妹壻'],
     '{M1W},xb,d&o':['舅表姊'],
     '{M1W},xb,d&o,h':['舅表姊壻'],
     '{M1W},xb,d&l':['舅表妹'],
@@ -377,8 +377,8 @@ export default {
     '{M1W},xs':['姨母'],
     '{M1W},xs,h':['姨父'],
     '{M1W},xs,[s|d]':['姨表兄弟姊妹'],
-    '{M1W},xs,[s&o|s&l]':['姨表兄弟'],
+    '{M1W},xs,s':['姨表兄弟'],
-    '{M1W},xs,[s&o|s&l],w':['姨表兄弟妇'],
+    '{M1W},xs,s,w':['姨表兄弟妇'],
     '{M1W},xs,s&o':['姨表兄'],
     '{M1W},xs,s&o,w':['姨表兄妇'],
     '{M1W},xs,s&l':['姨表弟'],
@@ -387,8 +387,8 @@ export default {
     '{M1W},xs,s,s,w':['姨表侄妇','侄妇'],
     '{M1W},xs,s,d':['姨表侄女','侄女'],
     '{M1W},xs,s,d,h':['姨表侄婿','侄婿'],
-    '{M1W},xs,[d&o|d&l]':['姨表姊妹'],
+    '{M1W},xs,d':['姨表姊妹'],
-    '{M1W},xs,[d&o|d&l],h':['姨表姊妹壻'],
+    '{M1W},xs,d,h':['姨表姊妹壻'],
     '{M1W},xs,d&o':['姨表姊'],
     '{M1W},xs,d&o,h':['姨表姊壻'],
     '{M1W},xs,d&l':['姨表妹'],
@@ -440,8 +440,8 @@ export default {
     '{M1M},lb':['叔父'],
     '{M1M},lb,w':['叔母'],
     '{M1M},xb,[s|d]':['叔表兄弟姊妹'],
-    '{M1M},xb,[s&o|s&l]':['叔表兄弟'],
+    '{M1M},xb,s':['叔表兄弟'],
-    '{M1M},xb,[s&o|s&l],w':['叔表兄弟妇'],
+    '{M1M},xb,s,w':['叔表兄弟妇'],
     '{M1M},xb,s&o':['叔表兄'],
     '{M1M},xb,s&o,w':['叔表兄妇'],
     '{M1M},xb,s&l':['叔表弟'],
@@ -450,8 +450,8 @@ export default {
     '{M1M},xb,s,s,w':['叔表侄妇','侄妇'],
     '{M1M},xb,s,d':['叔表侄女','侄女'],
     '{M1M},xb,s,d,h':['叔表侄婿','侄婿'],
-    '{M1M},xb,[d&o|d&l]':['叔表姊妹'],
+    '{M1M},xb,d':['叔表姊妹'],
-    '{M1M},xb,[d&o|d&l],h':['叔表姊妹壻'],
+    '{M1M},xb,d,h':['叔表姊妹壻'],
     '{M1M},xb,d&o':['叔表姊'],
     '{M1M},xb,d&o,h':['叔表姊壻'],
     '{M1M},xb,d&l':['叔表妹'],
@@ -463,8 +463,8 @@ export default {
     '{M1M},xs':['姑母'],
     '{M1M},xs,h':['姑父'],
     '{M1M},xs,[s|d]':['姑表兄弟姊妹'],
-    '{M1M},xs,[s&o|s&l]':['姑表兄弟'],
+    '{M1M},xs,s':['姑表兄弟'],
-    '{M1M},xs,[s&o|s&l],w':['姑表兄弟妇'],
+    '{M1M},xs,s,w':['姑表兄弟妇'],
     '{M1M},xs,s&o':['姑表兄'],
     '{M1M},xs,s&o,w':['姑表兄妇'],
     '{M1M},xs,s&l':['姑表弟'],
@@ -473,8 +473,8 @@ export default {
     '{M1M},xs,s,s,w':['姑表侄妇','侄妇'],
     '{M1M},xs,s,d':['姑表侄女','侄女'],
     '{M1M},xs,s,d,h':['姑表侄婿','侄婿'],
-    '{M1M},xs,[d&o|d&l]':['姑表姊妹'],
+    '{M1M},xs,d':['姑表姊妹'],
-    '{M1M},xs,[d&o|d&l],h':['姑表姊妹壻'],
+    '{M1M},xs,d,h':['姑表姊妹壻'],
     '{M1M},xs,d&o':['姑表姊'],
     '{M1M},xs,d&o,h':['姑表姊壻'],
     '{M1M},xs,d&l':['姑表妹'],
@@ -591,7 +591,7 @@ export default {
     '{M0},xs,s,w':['甥妇'],
     '{M0},xs,d':['甥女'],
     '{M0},xs,d,h':['甥婿'],
-    '{M-1},[f&o|f&l]':['兄弟'],
+    '{M-1},f':['兄弟'],
     '{M-1},f&o':['兄'],
     '{M-1},f&l':['弟'],
     '{M-1},f,f':['父'],
@@ -604,23 +604,23 @@ export default {
     '{M-1},f,m':['母'],
     '{M-1},f,m,f':['外祖父'],
     '{M-1},f,m,m':['外祖母'],
-    '{M-1},f,[ob|lb]':['叔兄弟'],
+    '{M-1},f,xb':['叔兄弟'],
-    '{M-1},f,[ob|lb],w':['叔兄弟妇'],
+    '{M-1},f,xb,w':['叔兄弟妇'],
     '{M-1},f,ob':['叔兄'],
     '{M-1},f,ob,w':['叔兄妇'],
     '{M-1},f,lb':['叔弟'],
     '{M-1},f,lb,w':['叔弟妇'],
     '{M-1},f,xb,s':['叔男'],
     '{M-1},f,xb,d':['叔女'],
-    '{M-1},f,[os|ls]':['姑姊妹'],
+    '{M-1},f,xs':['姑姊妹'],
-    '{M-1},f,[os|ls],h':['姑姊妹壻'],
+    '{M-1},f,xs,h':['姑姊妹壻'],
     '{M-1},f,os':['姑姊'],
     '{M-1},f,os,h':['姑姊壻'],
     '{M-1},f,ls':['姑妹'],
     '{M-1},f,ls,h':['姑妹壻'],
     '{M-1},f,xs,s':['姑男'],
     '{M-1},f,xs,d':['姑女'],
-    '{M-1},[m&o|m&l]':['姊妹'],
+    '{M-1},m':['姊妹'],
     '{M-1},m&o':['姊'],
     '{M-1},m&l':['妹'],
     '{M-1},m,f':['父'],
@@ -629,16 +629,16 @@ export default {
     '{M-1},m,m':['母'],
     '{M-1},m,m,f':['外祖父'],
     '{M-1},m,m,m':['外祖母'],
-    '{M-1},m,[ob|lb]':['舅兄弟'],
+    '{M-1},m,xb':['舅兄弟'],
-    '{M-1},m,[ob|lb],w':['舅兄弟妇'],
+    '{M-1},m,xb,w':['舅兄弟妇'],
     '{M-1},m,ob':['舅兄'],
     '{M-1},m,ob,w':['舅兄妇'],
     '{M-1},m,lb':['舅弟'],
     '{M-1},m,lb,w':['舅弟妇'],
     '{M-1},m,xb,s':['舅男'],
     '{M-1},m,xb,d':['舅女'],
-    '{M-1},m,[os|ls]':['姨姊妹'],
+    '{M-1},m,xs':['姨姊妹'],
-    '{M-1},m,[os|ls],h':['姨姊妹壻'],
+    '{M-1},m,xs,h':['姨姊妹壻'],
     '{M-1},m,os':['姨姊'],
     '{M-1},m,os,h':['姨姊壻'],
     '{M-1},m,ls':['姨妹'],