Merge branch 'master' of https://github.com/mumuy/relationship

src/module/data/branch.js

@@ -125,11 +125,11 @@ export default {
     'f,{G1},s&l':['叔父','叔爸','叔叔','叔'],
     'f,{G1},s&l,w':['叔母','婶'],
     'f,{G1},d':['姑母','姑姑','姑妈','姑'],
-    'f,{G1},d,h':['姑父'],
+    'f,{G1},d,h':['姑父','姑丈','姑爸','姑夫'],
     'm,{G1},s':['舅父','舅舅','舅爸','舅'],
     'm,{G1},s,w':['舅母','舅妈'],
     'm,{G1},d':['姨母','姨姨','姨妈','姨'],
-    'm,{G1},d,h':['姨父','姨爸','姨丈'],
+    'm,{G1},d,h':['姨父','姨丈','姨爸','姨夫'],
     // 同辈及以下
     '{G1},s':['兄弟'],
     '{G1},s,w':['兄弟妇'],
@@ -362,8 +362,8 @@ export default {
     '{M1W},xb,d,s,w':['舅表甥妇','甥妇'],
     '{M1W},xb,d,d':['舅表甥女','甥女'],
     '{M1W},xb,d,d,h':['舅表甥婿','甥婿'],
-    '{M1W},xs':['姨母'],
+    '{M1W},xs':['姨母','姨妈'],
-    '{M1W},xs,h':['姨父'],
+    '{M1W},xs,h':['姨父','姨丈','姨夫'],
     '{M1W},xs,[s|d]':['姨表兄弟姊妹'],
     '{M1W},xs,s':['姨表兄弟'],
     '{M1W},xs,s,w':['姨表兄弟妇'],
@@ -448,8 +448,8 @@ export default {
     '{M1M},xb,d,s,w':['叔表甥妇','甥妇'],
     '{M1M},xb,d,d':['叔表甥女','甥女'],
     '{M1M},xb,d,d,h':['叔表甥婿','甥婿'],
-    '{M1M},xs':['姑母'],
+    '{M1M},xs':['姑母','姑妈'],
-    '{M1M},xs,h':['姑父'],
+    '{M1M},xs,h':['姑父','姑丈','姑夫'],
     '{M1M},xs,[s|d]':['姑表兄弟姊妹'],
     '{M1M},xs,s':['姑表兄弟'],
     '{M1M},xs,s,w':['姑表兄弟妇'],
@@ -501,8 +501,8 @@ export default {
     '{M0},f,xb,d&o,h':['叔表姊壻'],
     '{M0},f,xb,d&l':['叔表妹'],
     '{M0},f,xb,d&l,h':['叔表妹壻'],
-    '{M0},f,xs':['姑母'],
+    '{M0},f,xs':['姑母','姑妈'],
-    '{M0},f,xs,h':['姑父'],
+    '{M0},f,xs,h':['姑父','姑丈','姑夫'],
     '{M0},f,xs,[s|d]':['姑表兄弟姊妹','姑表姊妹兄弟'],
     '{M0},f,xs,s':['姑表兄弟'],
     '{M0},f,xs,s,w':['姑表兄弟妇'],
@@ -544,8 +544,8 @@ export default {
     '{M0},m,xb,d&o,h':['舅表姊壻'],
     '{M0},m,xb,d&l':['舅表妹'],
     '{M0},m,xb,d&l,h':['舅表妹壻'],
-    '{M0},m,xs':['姨母'],
+    '{M0},m,xs':['姨母','姨妈'],
-    '{M0},m,xs,h':['姨父'],
+    '{M0},m,xs,h':['姨父','姨丈','姨夫'],
     '{M0},m,xs,[s|d]':['姨兄弟姊妹','姨姊妹兄弟'],
     '{M0},m,xs,s':['姨兄弟'],
     '{M0},m,xs,s,w':['姨兄弟妇'],

src/module/data/main.js

@@ -100,10 +100,10 @@ export default {
     'f,xb,d,s,w':['堂外甥媳妇'],
     'f,xb,d,d':['堂外甥女'],
     'f,xb,d,d,h':['堂外甥女婿'],
-    'f,os':['大姑','大姑妈','姑姊','姑嬷'],
+    'f,os':['大姑','姑姊','姑嬷'],
-    'f,os,h':['大姑丈','大姑父','大姑爸','恩伯'],
+    'f,os,h':['大姑丈','大姑夫','恩伯'],
-    'f,ls':['小姑','小姑妈','姑姐','姑妹','姑仔','尕娘','幺姑姐','老姑'],
+    'f,ls':['小姑','姑姐','姑妹','姑仔','尕娘','幺姑姐','老姑'],
-    'f,ls,h':['小姑丈','小姑父','小姑爹','恩叔'],
+    'f,ls,h':['小姑丈','小姑夫','恩叔'],
     'f,xs':['姑妈','姑母','姑姑','恩妈','几姑','姑','阿姑','嬢嬢','娘娘'],
     'f,xs,h':['姑丈','姑父','姑爸','恩爸','姑伯','姑爹','姑夫','姑婿','姑郎','亘'],
     'f,f,xb,s&o':['堂伯'],
@@ -156,10 +156,10 @@ export default {
     'm,lb,w':['小舅妈','小妗','细妗'],
     'm,xb':['舅舅','舅爸','舅父','舅爹','娘舅','母舅','阿舅','妗公','舅台','几舅','舅'],
     'm,xb,w':['舅妈','舅母','舅娘','娘妗','舅妻','舅姆','舅姆妈','舅媳妇','舅妇','舅姥','老妗','妗子','妗妗','妗妈','妗娘','妗母','阿妗','妗门','妗婆仔','妗儿妈','妗','嬢嬢'],
-    'm,os':['大姨','大姨妈','姨嬷'],
+    'm,os':['大姨','大姨夫','姨嬷'],
-    'm,os,h':['大姨丈','大姨父','大姨爸','姨伯'],
+    'm,os,h':['大姨丈','姨伯'],
-    'm,ls':['小姨','小姨妈','姨仔','老姨'],
+    'm,ls':['小姨','姨仔','老姨'],
-    'm,ls,h':['小姨丈','小姨父','小姨爹','老姨夫','姨叔'],
+    'm,ls,h':['小姨丈','小姨夫','老姨夫','姨叔'],
     'm,xs':['姨妈','姨母','姨姨','姨娘','阿姨','几姨','姨','从母','嬢嬢'],
     'm,xs,h':['姨丈','姨父','姨爸','姨爹','姨夫','姨婿','姨郎','尹'],
     'm,f,xb,s':['堂舅'],