Skip to content

Commit

Permalink
updated 缩进统一，配置修改
Browse files Browse the repository at this point in the history
  • Loading branch information
@mumuy
mumuy committed Sep 28, 2016
1 parent 7b1e211 commit f1f8a54
Show file tree
Hide file tree
Showing 3 changed files with 170 additions and 171 deletions.
1 change: 0 additions & 1 deletion .travis.yml
View file
Expand Up @@ -10,7 +10,6 @@ install:

script:
- npm run build
- npm test

branches:
only:
Expand Down
170 changes: 85 additions & 85 deletions dist/relationship.js
View file
Expand Up @@ -175,14 +175,14 @@
'f,f,f':['曾祖父','太爷','太爷爷','太公','祖公','祖奶爷'],
'f,f,f,f':['高祖父','老太爷','祖太爷'],
'f,f,f,f,ob':['伯高祖父'],
'f,f,f,f,ob,w':['伯高祖母'],
'f,f,f,f,ob,w':['伯高祖母'],
'f,f,f,f,lb':['叔高祖父'],
'f,f,f,f,lb,w':['叔高祖母'],
'f,f,f,f,xs':['姑高祖母'],
'f,f,f,f,xs,h':['姑高祖父'],
'f,f,f,f,lb,w':['叔高祖母'],
'f,f,f,f,xs':['姑高祖母'],
'f,f,f,f,xs,h':['姑高祖父'],
'f,f,f,m':['高祖母','老太太','祖太太'],
'f,f,f,m,xs':['姨高祖母'],
'f,f,f,m,xs,h':['姨高祖父'],
'f,f,f,m,xs':['姨高祖母'],
'f,f,f,m,xs,h':['姨高祖父'],
'f,f,f,ob':['伯曾祖父','曾伯祖父','伯公太','伯太爷'],
'f,f,f,ob,w':['叔曾祖母','曾伯祖母','伯婆太','伯太太'],
'f,f,f,lb':['伯曾祖父','曾叔祖父','叔公太','叔太爷'],
Expand All @@ -197,35 +197,35 @@
'f,f,f,xb,s,s&l,w':['从叔母'],
'f,f,f,xb,s,s,s&o':['族兄'],
'f,f,f,xb,s,s,s&l':['族弟'],
'f,f,f,xb,d':['堂姑祖母'],
'f,f,f,xb,d,h':['堂姑祖父'],
'f,f,f,xb,d':['堂姑祖母'],
'f,f,f,xb,d,h':['堂姑祖父'],
'f,f,f,xs':['姑曾祖母','曾祖姑母','太姑婆','姑婆太','姑太太'],
'f,f,f,xs,h':['姑曾祖父','曾祖姑丈','太姑丈公','姑丈公太','姑太爷'],
'f,f,f,xs,s&o':['表伯祖父'],
'f,f,f,xs,s&o,w':['表伯祖母'],
'f,f,f,xs,s&l':['表叔祖父'],
'f,f,f,xs,s&l,w':['表叔祖母'],
'f,f,f,xs,d':['表姑祖母'],
'f,f,f,xs,d,h':['表姑祖父'],
'f,f,f,xs,d':['表姑祖母'],
'f,f,f,xs,d,h':['表姑祖父'],
'f,f,m':['曾祖母','太奶奶','太婆','祖婆','祖奶奶'],
'f,f,m,f':['高外祖父'],
'f,f,m,m':['高外祖母'],
'f,f,m,f':['高外祖父'],
'f,f,m,m':['高外祖母'],
'f,f,m,xb':['舅曾祖父','太舅公','太舅爷','舅太爷'],
'f,f,m,xb,w':['舅曾祖母','太舅婆','舅太太'],
'f,f,m,xb,s&o':['表伯祖父'],
'f,f,m,xb,s&o,w':['表伯祖母'],
'f,f,m,xb,s&l':['表叔祖父'],
'f,f,m,xb,s&l,w':['表叔祖母'],
'f,f,m,xb,d':['表姑祖母'],
'f,f,m,xb,d,h':['表姑祖父'],
'f,f,m,xb,d':['表姑祖母'],
'f,f,m,xb,d,h':['表姑祖父'],
'f,f,m,xs':['姨曾祖母','太姨奶','姨太太','曾姨奶奶'],
'f,f,m,xs,h':['姨曾祖父','太姨爷','姨太爷'],
'f,f,m,xs,s&o':['表伯祖父'],
'f,f,m,xs,s&o,w':['表伯祖母'],
'f,f,m,xs,s&l':['表叔祖父'],
'f,f,m,xs,s&l,w':['表叔祖母'],
'f,f,m,xs,d':['表姑祖母'],
'f,f,m,xs,d,h':['表姑祖父'],
'f,f,m,xs,d':['表姑祖母'],
'f,f,m,xs,d,h':['表姑祖父'],
'f,f,xb':['堂祖父','x爷爷'],
'f,f,xb,w':['堂祖母'],
'f,f,xb,s&o':['堂伯','堂伯父','从父伯父'],
Expand Down Expand Up @@ -262,33 +262,33 @@
'f,f,xs,d,h':['姑表姑父','表姑爸','表姑父','表姑丈'],
'f,m':['奶奶','祖母','阿嫲','嫲嫲'],
'f,m,f':['曾外祖父','外太公'],
'f,m,f,xb,s':['堂舅祖父'],
'f,m,f,xb,s,w':['堂舅祖母'],
'f,m,f,xb,d':['堂姨祖母'],
'f,m,f,xb,d,h':['堂姨祖父'],
'f,m,f,ob':['伯曾外祖父','伯太姥爷','伯太奶爷'],
'f,m,f,ob,w':['伯曾外祖母','伯太姥姥','伯太奶奶'],
'f,m,f,lb':['叔曾外祖父','叔太姥爷','叔太奶爷'],
'f,m,f,lb,w':['叔曾外祖母','叔太姥姥','叔太奶奶'],
'f,m,f,xs':['姑曾外祖母','姑太姥姥','姑太奶奶'],
'f,m,f,xs,h':['姑曾外祖父','姑太姥爷','姑太奶爷'],
'f,m,f,xs,s':['表舅祖父'],
'f,m,f,xs,s,w':['表舅祖母'],
'f,m,m,xs,d':['表姨祖母'],
'f,m,m,xs,d,h':['表姨祖父'],
'f,m,f,xb,s':['堂舅祖父'],
'f,m,f,xb,s,w':['堂舅祖母'],
'f,m,f,xb,d':['堂姨祖母'],
'f,m,f,xb,d,h':['堂姨祖父'],
'f,m,f,ob':['伯曾外祖父','伯太姥爷','伯太奶爷'],
'f,m,f,ob,w':['伯曾外祖母','伯太姥姥','伯太奶奶'],
'f,m,f,lb':['叔曾外祖父','叔太姥爷','叔太奶爷'],
'f,m,f,lb,w':['叔曾外祖母','叔太姥姥','叔太奶奶'],
'f,m,f,xs':['姑曾外祖母','姑太姥姥','姑太奶奶'],
'f,m,f,xs,h':['姑曾外祖父','姑太姥爷','姑太奶爷'],
'f,m,f,xs,s':['表舅祖父'],
'f,m,f,xs,s,w':['表舅祖母'],
'f,m,m,xs,d':['表姨祖母'],
'f,m,m,xs,d,h':['表姨祖父'],
'f,m,m':['曾外祖母','外太婆'],
'f,m,m,xb':['舅曾外祖父','舅太姥爷','舅太奶爷'],
'f,m,m,xb,w':['舅曾外祖母','舅太姥姥','舅太奶奶'],
'f,m,m,xb,s':['表舅祖父'],
'f,m,m,xb,s,w':['表舅祖母'],
'f,m,m,xb,d':['表姨祖母'],
'f,m,m,xb,d,h':['表姨祖父'],
'f,m,m,xs':['姨曾外祖母','姨太姥姥','姨太奶奶'],
'f,m,m,xs,h':['姨曾外祖父','姨太姥爷','姨太奶爷'],
'f,m,m,xs,s':['表舅祖父'],
'f,m,m,xs,s,w':['表舅祖母'],
'f,m,m,xs,d':['表姨祖母'],
'f,m,m,xs,d,h':['表姨祖父'],
'f,m,m,xb':['舅曾外祖父','舅太姥爷','舅太奶爷'],
'f,m,m,xb,w':['舅曾外祖母','舅太姥姥','舅太奶奶'],
'f,m,m,xb,s':['表舅祖父'],
'f,m,m,xb,s,w':['表舅祖母'],
'f,m,m,xb,d':['表姨祖母'],
'f,m,m,xb,d,h':['表姨祖父'],
'f,m,m,xs':['姨曾外祖母','姨太姥姥','姨太奶奶'],
'f,m,m,xs,h':['姨曾外祖父','姨太姥爷','姨太奶爷'],
'f,m,m,xs,s':['表舅祖父'],
'f,m,m,xs,s,w':['表舅祖母'],
'f,m,m,xs,d':['表姨祖母'],
'f,m,m,xs,d,h':['表姨祖父'],
'f,m,xb':['舅祖父','舅公','舅老爷','舅爷爷','舅爷','舅祖','舅奶爷','太舅父'],
'f,m,xb,w':['舅祖母','舅婆','舅奶奶','妗婆','太舅母'],
'f,m,xb,s&o':['舅表伯父','表伯父','表伯'],
Expand Down Expand Up @@ -364,37 +364,37 @@
'm':['妈妈','母亲','老妈','阿妈','老母','老妈子','娘','娘亲','妈咪'],
'm,f':['外公','外祖父','姥爷','阿公'],
'm,f,f':['外曾祖父','外太祖父','太外祖父','太姥爷','外太公'],
'm,f,f,f':['外高祖父'],
'm,f,f,m':['外高祖母'],
'm,f,f,xb,s&o':['堂伯外祖父'],
'm,f,f,xb,s&o,w':['堂伯外祖母'],
'm,f,f,xb,s&l':['堂叔外祖父'],
'm,f,f,xb,s&l,w':['堂叔外祖母'],
'm,f,f,xb,d':['堂姑外祖母'],
'm,f,f,xb,d,h':['堂姑外祖父'],
'm,f,f,f':['外高祖父'],
'm,f,f,m':['外高祖母'],
'm,f,f,xb,s&o':['堂伯外祖父'],
'm,f,f,xb,s&o,w':['堂伯外祖母'],
'm,f,f,xb,s&l':['堂叔外祖父'],
'm,f,f,xb,s&l,w':['堂叔外祖母'],
'm,f,f,xb,d':['堂姑外祖母'],
'm,f,f,xb,d,h':['堂姑外祖父'],
'm,f,f,ob':['伯外曾祖父','外太伯公','伯太姥爷','伯太奶爷'],
'm,f,f,ob,w':['伯外曾祖母','外太伯母','伯太姥姥','伯太奶奶'],
'm,f,f,lb':['叔外曾祖父','外太叔公','叔太姥爷','叔太奶爷'],
'm,f,f,lb':['叔外曾祖父','外太叔公','叔太姥爷','叔太奶爷'],
'm,f,f,lb,w':['叔外曾祖母','外太叔母','叔太姥姥','叔太奶奶'],
'm,f,f,xs':['姑外曾祖母','外太姑婆','姑太姥姥','姑太奶奶'],
'm,f,f,xs,h':['姑外曾祖父','外太姑丈公','姑太姥爷','姑太奶爷'],
'm,f,f,xs,s&o':['表伯外祖父','外表伯祖父'],
'm,f,f,xs,s&o,w':['表伯外祖母','外表伯祖母'],
'm,f,f,xs,s&l':['表叔外祖父','外表叔祖父'],
'm,f,f,xs,s&l,w':['表叔外祖母','外表叔祖母'],
'm,f,f,xs,d':['表姑外祖母'],
'm,f,f,xs,d,h':['表姑外祖父'],
'm,f,f,xs,d':['表姑外祖母'],
'm,f,f,xs,d,h':['表姑外祖父'],
'm,f,m':['外曾祖母','外太祖母','太外祖母','太姥姥','外太婆'],
'm,f,m,f':['外高外祖父'],
'm,f,m,m':['外高外祖母'],
'm,f,m,f':['外高外祖父'],
'm,f,m,m':['外高外祖母'],
'm,f,m,xb':['舅外曾祖父','外太舅公','舅太姥爷','舅太奶爷'],
'm,f,m,xb,w':['舅外曾祖母','外太舅母','舅太姥姥','舅太奶奶','外太舅婆'],
'm,f,m,xb,d':['表姑外祖母'],
'm,f,m,xb,d,h':['表姑外祖父'],
'm,f,m,xb,d':['表姑外祖母'],
'm,f,m,xb,d,h':['表姑外祖父'],
'm,f,m,xs':['姨外曾祖母','外太姨婆','姨太姥姥','姨太奶奶'],
'm,f,m,xs,h':['姨外曾祖父','外太姑姨公','姨太姥爷','姨太奶爷'],
'm,f,m,xs,d':['表姑外祖母'],
'm,f,m,xs,d,h':['表姑外祖父'],
'm,f,m,xs,d':['表姑外祖母'],
'm,f,m,xs,d,h':['表姑外祖父'],
'm,f,xb':['小姥爷','x姥爷'],
'm,f,xb,s':['堂舅','堂舅爸','堂舅父','堂舅舅','从父舅父'],
'm,f,xb,s,w':['堂舅妈','堂舅母','从父舅母'],
Expand All @@ -416,33 +416,33 @@
'm,f,xs,d,d':['从表姐妹'],
'm,m':['外婆','外祖母','姥姥','阿婆'],
'm,m,f':['外曾外祖父','外太外公','太姥爷'],
'm,m,f,xb,s':['堂舅外祖父'],
'm,m,f,xb,s,w':['堂舅外祖母'],
'm,m,f,xb,d':['堂姨外祖母'],
'm,m,f,xb,d,h':['堂姨外祖父'],
'm,m,f,ob':['伯外曾外祖父','伯太姥爷'],
'm,m,f,ob,w':['伯外曾外祖母','伯太姥姥'],
'm,m,f,lb':['叔外曾外祖父','叔太姥爷'],
'm,m,f,lb,w':['叔外曾外祖母','叔太姥姥'],
'm,m,f,xs':['姑外曾外祖母','姑太姥姥'],
'm,m,f,xs,h':['姑外曾外祖父','姑太姥爷'],
'm,m,f,xs,s':['表舅外祖父'],
'm,m,f,xs,s,w':['表舅外祖母'],
'm,m,f,xs,d':['表姨外祖母'],
'm,m,f,xs,d,h':['表姨外祖父'],
'm,m,f,xb,s':['堂舅外祖父'],
'm,m,f,xb,s,w':['堂舅外祖母'],
'm,m,f,xb,d':['堂姨外祖母'],
'm,m,f,xb,d,h':['堂姨外祖父'],
'm,m,f,ob':['伯外曾外祖父','伯太姥爷'],
'm,m,f,ob,w':['伯外曾外祖母','伯太姥姥'],
'm,m,f,lb':['叔外曾外祖父','叔太姥爷'],
'm,m,f,lb,w':['叔外曾外祖母','叔太姥姥'],
'm,m,f,xs':['姑外曾外祖母','姑太姥姥'],
'm,m,f,xs,h':['姑外曾外祖父','姑太姥爷'],
'm,m,f,xs,s':['表舅外祖父'],
'm,m,f,xs,s,w':['表舅外祖母'],
'm,m,f,xs,d':['表姨外祖母'],
'm,m,f,xs,d,h':['表姨外祖父'],
'm,m,m':['外曾外祖母','外太外婆','太姥姥'],
'm,m,m,xb':['舅外曾外祖父','舅太姥爷'],
'm,m,m,xb,w':['舅外曾外祖母','舅太姥姥'],
'm,m,m,xb,s':['表舅外祖父'],
'm,m,m,xb,s,w':['表舅外祖母'],
'm,m,m,xb,d':['表姨外祖母'],
'm,m,m,xb,d,h':['表姨外祖父'],
'm,m,m,xs':['姨外曾外祖母','姨太姥姥'],
'm,m,m,xs,h':['姨外曾外祖父','姨太姥爷'],
'm,m,m,xs,s':['表舅外祖父'],
'm,m,m,xs,s,w':['表舅外祖母'],
'm,m,m,xs,d':['表姨外祖母'],
'm,m,m,xs,d,h':['表姨外祖父'],
'm,m,m,xb':['舅外曾外祖父','舅太姥爷'],
'm,m,m,xb,w':['舅外曾外祖母','舅太姥姥'],
'm,m,m,xb,s':['表舅外祖父'],
'm,m,m,xb,s,w':['表舅外祖母'],
'm,m,m,xb,d':['表姨外祖母'],
'm,m,m,xb,d,h':['表姨外祖父'],
'm,m,m,xs':['姨外曾外祖母','姨太姥姥'],
'm,m,m,xs,h':['姨外曾外祖父','姨太姥爷'],
'm,m,m,xs,s':['表舅外祖父'],
'm,m,m,xs,s,w':['表舅外祖母'],
'm,m,m,xs,d':['表姨外祖母'],
'm,m,m,xs,d,h':['表姨外祖父'],
'm,m,xb':['舅外祖父','外舅公','外舅祖父','舅姥爷','舅外公','舅公'],
'm,m,xb,w':['舅外祖母','外舅婆','外舅祖母','舅姥姥','舅婆'],
'm,m,xb,s':['舅表舅父','舅表舅爸','表舅父','表舅爸','表舅','表舅舅','舅表舅舅'],
Expand Down

0 comments on commit f1f8a54

Please sign in to comment.