updated 一次数据错误修复及增加父辈合称

dist/relationship.min.js

@@ -6,6 +6,4 @@
  * Released under the MIT License.
  * https://github.com/mumuy/relationship/blob/master/LICENSE
 */
-!function(s,f){"object"==typeof module&&module.exports?module.exports=f():s.relationship=f()}("undefined"!=typeof window?window:this,function(){function s(s){s=s.replace(/[二|三|四|五|六|七|八|九|十]{1,2}/g,"x"),s=s.replace(/之/,"的").replace(/我的?(.+)/,"$1"),s.match(/[^娘婆亲]家的?/)&&(s=s.replace(/家的?/,"的"));for(var f=s.split("的"),x=[],d=!0,m={"哥":"兄","姐":"姊","侄":"姪","孙女婿":"孙婿","甥女婿":"甥婿","侄女婿":"侄婿","孙媳妇":"孙妇","甥媳妇":"甥妇","侄媳妇":"侄妇"},b={"^表":["姑表","舅表"],"^姻":["姑姻","姨姻","姊妹姻","女姻"],"^眷":["叔眷","舅眷","兄弟眷","男眷"],"^外甥":["甥"],"孙$":["孙男","孙女"],"甥$":["甥男","甥女"],"侄$":["侄男","侄女"],"外甥$":["甥"],"嫂$":["兄妇"]};f.length;){var w=f.shift(),h=[],l=[w];for(var e in m){var r=w.replace(e,m[e]),t=w.replace(m[e],e);r!=w&&l.push(r),t!=w&&l.push(t)}var n=function(s){for(var f in b){var x=b[f];x.forEach(function(x){var d=s.replace(new RegExp(f),x);d!=s&&(l.push(d),n(d))})}};l.forEach(n);for(var a in o){var c=o[a];c.indexOf(w)>-1&&h.push(a)}if(!h.length)for(var a in o){var c=o[a];l.forEach(function(s){c.indexOf(s)>-1&&h.push(a)})}h.length||(d=!1);var $=[];x.length||(x=[""]),x.forEach(function(s){h.forEach(function(f){$.push(s+(f?","+f:""))})}),x=$}return d?x:[]}function f(s,f){var x=[],d={};f<0&&(s.match(/^,w/)?f=1:s.match(/^,h/)&&(f=0));var m=function(s,f){if(s.indexOf(",1")==-1&&s.indexOf(",0")==-1&&(s=","+f+s),s.match(/,[w0],w|,[h1],h/))return!1;var b="";if(!d[s]){d[s]=!0;var h=!0;do{b=s;for(var o in w){var l=w[o];if(s=s.replace(l.exp,l.str),s.indexOf("#")>-1){for(var e=s.split("#"),r=0;r<e.length;r++)m(e[r]);h=!1;break}}}while(b!=s);if(h){if(s.match(/,[w0],w|,[h1],h/))return!1;s=s.replace(/,[01]/,"").substr(1),x.push(s)}}};return f<0?(m(s,1),m(s,0)):m(s,f),e(x)}function x(s){var f=[],x=function(s){var f=[];for(var x in o)if(x.replace(/&[ol]/g,"")==s)f.push(o[x][0]);else for(var d=s;d.match(/[ol](b|s)/);)if(d=d.replace(/[ol](b|s)/,"x$1"),d==x){f.push(o[x][0]);break}return f};if(o[s])f.push(o[s][0]);else if(f=x(s),f.length||(s=s.replace(/&[ol]/g,""),f=x(s)),f.length||(s=s.replace(/[ol](b|s)/g,"x$1"),f=x(s)),!f.length){var d=s.replace(/x/g,"l");f=x(d);var m=s.replace(/x/g,"o");f=f.concat(x(m))}return f}function d(s,f){var x={f:["d","s"],m:["d","s"],h:["w",""],w:["","h"],s:["m","f"],d:["m","f"],lb:["os","ob"],ob:["ls","lb"],xb:["xs","xb"],ls:["os","ob"],os:["ls","lb"],xs:["xs","xb"]},d="";if(s.match(/&o$/)?d="&l":s.match(/&l$/)&&(d="&o"),s){s=s.replace(/&[ol]/g,""),f<0&&(s.match(/^w/)?f=1:s.match(/^h/)&&(f=0));var m=[],b=function(f){var m=(","+f+","+s).replace(/,[fhs]|,[olx]b/g,",1").replace(/,[mwd]|,[olx]s/g,",0");m=m.substring(0,m.lastIndexOf(","));for(var b=s.split(",").reverse(),w=m.split(",").reverse(),h=[],o=0;o<b.length;o++)h.push(x[b[o]][w[o]]);var l=0,e={f:1,m:1,s:-1,d:-1};return h.forEach(function(s){l+=e[s]||0}),h.join(",")+(l?"":d)};return f<0?(m.push(b(1)),m.push(b(0))):m.push(b(f)),m}return[""]}function m(s){var f=s.split(",");return f.map(function(s){var f=s.replace(/&[ol]/,"");return o[f][0]}).join("的")}function b(s,x,m){if(m<0){var b=-1,w=-1;if(s.match(/^,w/)||s.match(/^,1/)?w=1:(s.match(/^,h/)||s.match(/^,0/))&&(w=0),x.match(/^,w/)||x.match(/^,1/)?b=1:(x.match(/^,h/)||x.match(/^,0/))&&(b=0),w==-1&&b>-1)m=b;else if(w>-1&&b==-1)m=w;else{if(w!=b)return!1;m=w}}var h=m,o=f(s,m),l=f(x,m),r=[];if(x){var t=!1,n=!1;l.forEach(function(s){s.match(/([fhs1](&[ol])?|[olx]b)$/)&&(t=!0),s.match(/([mwd0](&[ol])?|[olx]s)$/)&&(n=!0),r=r.concat(d(s,m))}),r=e(r),t&&n?h=-1:t?h=1:n&&(h=0)}else r=[""];var a=o.length>1?"["+o.join("|")+"]":o[0],c=r.length>1?"["+r.join("|")+"]":r[0];return{selector:(x?","+c:"")+(s?","+a:""),sex:h}}var w=[{exp:/^(.+)&o([^#]+)&l/g,str:"$1$2"},{exp:/^(.+)&l([^#]+)&o/g,str:"$1$2"},{exp:/^(.+)?,o([sb])([^#]+)&l/g,str:"$1,x$2$3"},{exp:/^(.+)?,l([sb])([^#]+)&o/g,str:"$1,x$2$3"},{exp:/(,[ds],(.+),[ds])&[ol]/g,str:"$1"},{exp:/(,o[sb])+(,o[sb])/,str:"$2"},{exp:/(,l[sb])+(,l[sb])/,str:"$2"},{exp:/^(.*)(,[fh1])(,[olx][sb])+,[olx]b(.*)$/,str:"$1$2,xb$4#$1$2$4"},{exp:/^(.*)(,[mw0])(,[olx][sb])+,[olx]s(.*)$/,str:"$1$2,xs$4#$1$2$4"},{exp:/(,[fh1])(,[olx][sb])+,[olx]s/g,str:"$1,xs"},{exp:/(,[mw0])(,[olx][sb])+,[olx]b/g,str:"$1,xb"},{exp:/^,[olx][sb],[olx]b(.+)?$/,str:"$1#,xb$1"},{exp:/^,[olx][sb],[olx]s(.+)?$/,str:"$1#,xs$1"},{exp:/^,x([sb])$/,str:",o$1#,l$1"},{exp:/m,h/g,str:"f"},{exp:/f,w/g,str:"m"},{exp:/,[xol][sb](,[mf])/g,str:"$1"},{exp:/,[mf],d&([ol])/,str:",$1s"},{exp:/,[mf],s&([ol])/,str:",$1b"},{exp:/^(.*)(,[fh1]|[xol]b),[mf],s(.*)$/,str:"$1$2,xb$3#$1$2$3"},{exp:/^(.*)(,[mw0]|[xol]s),[mf],d(.*)$/,str:"$1$2,xs$3#$1$2$3"},{exp:/(,[mw0]|[xol]s),[mf],s/,str:"$1,xb"},{exp:/(,[fh1]|[xol]b),[mf],d/,str:"$1,xs"},{exp:/^,[mf],s(.+)?$/,str:",1$1#,xb$1"},{exp:/^,[mf],d(.+)?$/,str:",0$1#,xs$1"},{exp:/,[ds]&o,ob/g,str:",s&o"},{exp:/,[ds]&o,os/g,str:",d&o"},{exp:/,[ds]&l,lb/g,str:",s&l"},{exp:/,[ds]&l,ls/g,str:",d&l"},{exp:/,[ds](&[ol]Line truncated
+!function(s,f){"object"==typeof module&&module.exports?module.exports=f():s.relationship=f()}("undefined"!=typeof window?window:this,function(){var e=[{exp:/^(.+)&o([^#]+)&l/g,str:"$1$2"},{exp:/^(.+)&l([^#]+)&o/g,str:"$1$2"},{exp:/^(.+)?,o([sb])([^#]+)&l/g,str:"$1,x$2$3"},{exp:/^(.+)?,l([sb])([^#]+)&o/g,str:"$1,x$2$3"},{exp:/(,[ds],(.+),[ds])&[ol]/g,str:"$1"},{exp:/(,o[sb])+(,o[sb])/,str:"$2"},{exp:/(,l[sb])+(,l[sb])/,str:"$2"},{exp:/^(.*)(,[fh1])(,[olx][sb])+,[olx]b(.*)$/,str:"$1$2,xb$4#$1$2$4"},{exp:/^(.*)(,[mw0])(,[olx][sb])+,[olx]s(.*)$/,str:"$1$2,xs$4#$1$2$4"},{exp:/(,[fh1])(,[olx][sb])+,[olx]s/g,str:"$1,xs"},{exp:/(,[mw0])(,[olx][sb])+,[olx]b/g,str:"$1,xb"},{exp:/^,[olx][sb],[olx]b(.+)?$/,str:"$1#,xb$1"},{exp:/^,[olx][sb],[olx]s(.+)?$/,str:"$1#,xs$1"},{exp:/^,x([sb])$/,str:",o$1#,l$1"},{exp:/m,h/g,str:"f"},{exp:/f,w/g,str:"m"},{exp:/,[xol][sb](,[mf])/g,str:"$1"},{exp:/,[mf],d&([ol])/,str:",$1s"},{exp:/,[mf],s&([ol])/,str:",$1b"},{exp:/^(.*)(,[fh1]|[xol]b),[mf],s(.*)$/,str:"$1$2,xb$3#$1$2$3"},{exp:/^(.*)(,[mw0]|[xol]s),[mf],d(.*)$/,str:"$1$2,xs$3#$1$2$3"},{exp:/(,[mw0]|[xol]s),[mf],s/,str:"$1,xb"},{exp:/(,[fh1]|[xol]b),[mf],d/,str:"$1,xs"},{exp:/^,[mf],s(.+)?$/,str:",1$1#,xb$1"},{exp:/^,[mf],d(.+)?$/,str:",0$1#,xs$1"},{exp:/,[ds]&o,ob/g,str:",s&o"},{exp:/,[ds]&o,os/g,str:",d&o"},{exp:/,[ds]&l,lb/g,str:",s&l"},{exp:/,[ds]&l,ls/g,str:",d&l"},{exp:/,[ds](&[ol])?,[olx]s/g,str:",d"},{exp:/,[ds](&[ol])?,[olx]b/g,str:",s"},{exp:/(,[mwd0](&[ol])?|[olx]s),[ds](&[ol])?,m/g,str:"$1"},{exp:/(,[mwd0](&[ol])?|[olx]s),[ds](&[ol])?,f/g,str:"$1,h"},{exp:/(,[fhs1](&[ol])?|[olx]b),[ds](&[ol])?,f/g,str:"$1"},{exp:/(,[fhs1](&[ol])?|[olx]b),[ds](&[ol])?,m/g,str:"$1,w"},{exp:/^,[ds],m(.+)?$/,str:"$1#,w$1"},{exp:/^,[ds],f(.+)?$/,str:"$1#,h$1"},{exp:/,[wh](,[ds])/g,str:"$1"},{exp:/,w,h|,h,w/g,str:""},{exp:/(.+)?\[([^\|]+?)\|([^\[\]]*\|[^\[\]]*)\](.+)?/g,str:"$1$2$4#$1[$3]$4"},{exp:/(.+)?\[([^\[\]\|]+?)\|([^\[\]\|]+?)?\](.+)?/g,str:"$1$2$4#$1$3$4"}],w={"":["自己","我","俺","本人","在下"],"[f,f|f,m|m,f|m,m]":["祖辈"],"[f,f|f,m]":["祖父母","爷爷奶奶"],"[m,f|m,m]":["外祖父母","外公外婆","姥姥姥爷"],"[f|m]":["父母","爹娘","爹妈","爸妈","爸爸妈妈","父母亲","双亲","二亲","两亲","二老","高堂"],"[h,f|h,m]":["公婆","翁姑","大家官","公公婆婆","姑嫜"],"[w,f|w,m]":["岳父母","岳父岳母","丈人丈母","舅姑"],"[f,ob|f,ob,w]":["伯父母"],"[h,f,ob|h,f,ob,w]":["伯公婆"],"[w,f,ob|w,f,ob,w]":["伯岳公婆"],"[f,lb|f,lb,w]":["叔父母"],"[h,f,lb|h,f,lb,w]":["叔公婆"],"[w,f,lb|w,f,lb,w]":["叔岳父母"],"[f,xs|f,xs,h]":["姑父母"],"[h,f,xs|h,f,xs,h]":["姑公婆"],"[w,f,xs|w,f,xs,h]":["姑岳父母"],"[m,xb|m,xb,h]":["舅父母"],"[h,m,xb|h,m,xb,h]":["舅公婆"],"[w,m,xb|w,m,xb,h]":["舅岳父母"],"[m,xs|m,xs,h]":["姨父母"],"[h,m,xs|h,m,xs,h]":["姨公婆"],"[w,m,xs|w,m,xs,h]":["姨岳父母"],"[f,xb,s|f,xb,d|m,xs,s|m,xs,d]":["从兄弟姐妹","从姐妹兄弟"],"[f,xb,s|f,xb,d]":["堂兄弟姐妹","堂姐妹兄弟","从父兄弟姐妹"],"[m,xs,s|m,xs,d]":["姨兄弟姐妹","姨姐妹兄弟","从母兄弟姐妹"],"[f,xb,s|m,xs,s]":["从兄弟"],"[f,xb,d|m,xs,d]":["从姐妹"],"[f,xs,s|f,xs,d|m,xb,s|m,xb,d]":["表兄弟姐妹","表姐妹兄弟"],"[f,xs,s|f,xs,d]":["姑表兄弟姐妹"],"[m,xb,s|m,xb,d]":["舅表兄弟姐妹"],"[f,xs,s|m,xb,s]":["姑舅兄弟","舅姑兄弟"],"[f,xs,d|m,xb,d]":["姑舅姊妹","舅姑姊妹"],"[f,xs,s&o|m,xb,s&o]":["姑舅哥","姑舅哥哥"],"[f,xs,s&l|m,xb,s&l]":["姑舅弟","姑舅弟弟"],"[f,xs,d&o|m,xb,d&o]":["姑舅姐","姑舅姐姐"],"[f,xs,d&l|m,xb,d&l]":["姑舅妹","姑舅妹妹"],"[xb|xs]":["兄弟姐妹","同胞","手足"],"[ob|os]":["哥哥姐姐"],"[lb|ls]":["弟弟妹妹"],"[ob|ob,w]":["哥哥嫂嫂"],"[xb,s|xb,d]":["侄子女","侄子侄女"],"[xs,s|xs,d]":["甥子女","外甥子女"],"[w|s|d]":["妻儿"],"[s|d]":["子女","儿女","小孩","孩子","孩子们","孩儿","小孩儿","宝宝","宝贝","娃","儿辈","子辈"],"[s,s|s,d|d,s|d,d]":["孙辈"],"[s,s|s,d]":["孙子女"],"[d,s|d,d]":["外孙子女"],"[s|d|s,s|s,d|d,s|d,d]":["儿孙","子孙","孙息"],"[s,w,f|s,w,m|d,h,f|d,h,m]":["亲家","儿女亲家"],f:["爸爸","父亲","老爸","阿爸","阿爹","老窦","老汉","老汉儿","老子","爸","父","爹","爹爹","爹地","爹啲","老爹","老爷子","一世祖"],"f,f":["爷爷","祖父","奶爷","阿爷","阿公","老爷","二世祖"],"f,f,f":["曾祖父","曾祖","太公","太爷","太爷爷","祖公","祖奶爷","太老爷","三世祖"],"f,f,f,f":["高祖父","老太奶爷","老太爷","祖太爷","祖太爷爷","祖太公","高王父","四世祖"],"f,f,f,f,f":["天祖父","高祖","五世祖"],"f,f,f,f,f,f":["烈祖父","烈祖","六世祖"],"f,f,f,f,f,f,f":["太祖父","太祖","七世祖"],"f,f,f,f,f,f,f,f":["远祖父","远祖","八世祖"],"f,f,f,f,f,f,f,f,f":["鼻祖父","鼻祖","始祖","九世祖"],"f,f,f,f,f,f,f,f,f,ob":["伯鼻祖父"],"f,f,f,f,f,f,f,f,f,ob,w":["伯鼻祖母"],"f,Line truncated
-"m,f,m,xs,d,s,w":["从母姑表舅母"],"m,f,m,xs,d,d":["从母姑表姨母"],"m,f,m,xs,d,d,h":["从母姑表姨父"],"m,f,ob":["外伯公","伯外祖父","外伯祖父","伯姥爷","外伯祖","伯外祖","大外公","大姥爷","大外爷"],"m,f,ob,w":["外伯婆","伯外祖母","外伯祖母","伯姥姥","外姆婆","大外婆","大姥姥","大姥奶"],"m,f,lb":["外叔公","叔外祖父","外叔祖父","叔姥爷","外叔祖","叔外祖","小外公","小姥爷","小外爷"],"m,f,lb,w":["外叔婆","叔外祖母","外叔祖母","叔姥姥","外婶婆","小外婆","小姥姥","小姥奶"],"m,f,xb":["x外公","x姥爷","x外爷"],"m,f,xb,w":["x外婆","x姥姥","x姥奶","x外奶","x姥"],"m,f,xb,s":["堂舅","堂舅爸","堂舅父","堂舅舅","从父舅父","叔伯舅父","叔伯舅"],"m,f,xb,s,w":["堂舅妈","堂舅母","从父舅母","叔伯舅母"],"m,f,xb,s,s&o":["堂舅表哥","从父舅表哥"],"m,f,xb,s,s&o,w":["堂舅表嫂","从父舅表嫂"],"m,f,xb,s,s&l":["堂舅表弟","从父舅表弟"],"m,f,xb,s,s&l,w":["堂舅表弟媳","从父舅表弟媳"],"m,f,xb,s,s,s":["堂舅表侄男","从父舅表侄男"],"m,f,xb,s,s,s,w":["堂舅表侄妇","从父舅表侄妇"],"m,f,xb,s,s,d":["堂舅表侄女","从父舅表侄女"],"m,f,xb,s,s,d,h":["堂舅表侄婿","从父舅表侄婿"],"m,f,xb,s,d&o":["堂舅表姐","从父舅表姐"],"m,f,xb,s,d&o,h":["堂舅表姐夫","从父舅表姐夫"],"m,f,xb,s,d&l":["堂舅表妹","从父舅表妹"],"m,f,xb,s,d&l,h":["堂舅表妹夫","从父舅表妹夫"],"m,f,xb,s,d,s":["堂舅表甥男","从父舅表甥男"],"m,f,xb,s,d,s,w":["堂舅表甥妇","从父舅表甥妇"],"m,f,xb,s,d,d":["堂舅表甥女","从父舅表甥女"],"m,f,xb,s,d,d,h":["堂舅表甥婿","从父舅表甥婿"],"m,f,xb,d":["堂姨","堂姨妈","堂姨母","堂阿姨","从父姨母","叔伯姨母","叔伯姨"],"m,f,xb,d,h":["堂姨丈","堂姨爸","堂姨父","从父姨父","叔伯姨父"],"m,f,xb,d,s&o":["堂姨表哥","从父姨表哥"],"m,f,xb,d,s&o,w":["堂姨表嫂","从父姨表嫂"],"m,f,xb,d,s&l":["堂姨表弟","从父姨表弟"],"m,f,xb,d,s&l,w":["堂姨表弟媳","从父姨表弟媳"],"m,f,xb,d,s,s":["堂姨表侄男","从父姨表侄男"],"m,f,xb,d,s,s,w":["堂姨表侄妇","从父姨表侄妇"],"m,f,xb,d,s,d":["堂姨表侄女","从父姨表侄女"],"m,f,xb,d,s,d,h":["堂姨表侄婿","从父姨表侄婿"],"m,f,xb,d,d&o":["堂姨表姐","从父姨表姐"],"m,f,xb,d,d&o,h":["堂姨表姐夫","从父姨表姐夫"],"m,f,xb,d,d&l":["堂姨表妹","从父姨表妹"],"m,f,xb,d,d&l,h":["堂姨表妹夫","从父姨表妹夫"],"m,f,xb,d,d,s":["堂舅表甥男","从父舅表甥男"],"m,f,xb,d,d,s,w":["堂舅表甥妇","从父舅表甥妇"],"m,f,xb,d,d,d":["堂舅表甥女","从父舅表甥女"],"m,f,xb,d,d,d,h":["堂舅表甥婿","从父舅表甥婿"],"m,f,xs":["外姑婆","姑姥姥","姑外祖母","外姑祖母","外祖姑母","外太姑母"],"m,f,xs,h":["外姑公","姑姥爷","姑外祖父","外姑祖父","外祖姑父","外太姑父","外姑丈公","外丈公"],"m,f,xs,s":["姑表舅父","姑表舅爸","姑表舅","姑表舅舅"],"m,f,xs,s,w":["姑表舅母","姑表舅妈"],"m,f,xs,s,s&o":["姑表舅表哥"],"m,f,xs,s,s&o,w":["姑表舅表嫂"],"m,f,xs,s,s&l":["姑表舅表弟"],"m,f,xs,s,s&l,w":["姑表舅表弟媳"],"m,f,xs,s,s,s":["姑表舅表侄男"],"m,f,xs,s,s,s,w":["姑表舅表侄妇"],"m,f,xs,s,s,d":["姑表舅表侄女"],"m,f,xs,s,s,d,h":["姑表舅表侄婿"],"m,f,xs,s,d&o":["姑表舅表姐"],"m,f,xs,s,d&o,h":["姑表舅表姐夫"],"m,f,xs,s,d&l":["姑表舅表妹"],"m,f,xs,s,d&l,h":["姑表舅表妹夫"],"m,f,xs,s,d,s":["姑表舅表甥男"],"m,f,xs,s,d,s,w":["姑表舅表甥妇"],"m,f,xs,s,d,d":["姑表舅表甥女"],"m,f,xs,s,d,d,h":["姑表舅表甥婿"],"m,f,xs,d":["姑表姨母","姑表姨妈","姑表姨","姑表阿姨","姑表姨姨","姑舅妈","舅姑妈","姑舅娘娘"],"m,f,xs,d,h":["姑表姨父","姑表姨爸","姑表姨丈"],"m,f,xs,d,s&o":["姑表姨表哥"],"m,f,xs,d,s&o,w":["姑表姨表嫂"],"m,f,xs,d,s&l":["姑表姨表弟"],"m,f,xs,d,s&l,w":["姑表姨表弟媳"],"m,f,xs,d,s,s":["姑表姨表侄男"],"m,f,xs,d,s,s,w":["姑表姨表侄妇"],"m,f,xs,d,s,d":["姑表姨表侄女"],"m,f,xs,d,s,d,h":["姑表姨表侄婿"],"m,f,xs,d,d&o":["姑表姨表姐"],"m,f,xs,d,d&o,h":["姑表姨表姐夫"],"m,f,xs,d,d&l":["姑表姨表妹"],"m,f,xs,d,d&l,h":["姑表姨表妹夫"],"m,f,xs,d,d,s":["姑表姨表甥男"],"m,f,xs,d,d,s,w":["姑表姨表甥妇"],"m,f,xs,d,d,d":["姑表姨表甥女"],"m,f,xs,d,d,d,h":["姑表姨表甥婿"],"m,m":["外婆","外祖母","外王母","姥姥","姥娘","阿婆","外奶","客婆","舅家婆","毑母","毑毑"],"m,m,f":["外曾外祖父","外太外公","外太姥爷","外太外翁","老姥爷"],"m,m,f,f":["外曾外曾祖父","祖太爷","祖太爷爷","祖太公","高王父"],"m,m,f,m":["外曾外曾祖母","祖太太","祖太奶奶","祖太婆","高王母"],"m,m,f,ob":["伯外曾外祖父","伯太姥爷"],"m,m,f,ob,w":["伯外曾外祖Line truncated
-"xb,d,h,f,m":["侄姻母"],"xb,d,h,m&o":["侄姻姊"],"xb,d,h,m&l":["侄姻妹"],"xb,d,h,m,f":["侄姻父"],"xb,d,h,m,m":["侄姻母"],"xb,d,h,xb":["侄姻男"],"xb,d,h,xb,w":["侄姻妇"],"xb,d,h,xs":["侄姻女"],"xb,d,h,xs,h":["侄姻婿"],"xb,d,s":["侄外孙","侄外孙男","外侄孙","外侄孙男"],"xb,d,s,w":["侄外孙媳","侄外孙妇","外侄孙媳","外侄孙妇"],"xb,d,s,w,f":["侄外孙眷男","姻家侄"],"xb,d,s,w,f,f&o":["侄外孙眷兄"],"xb,d,s,w,f,f&l":["侄外孙眷弟"],"xb,d,s,w,f,m&o":["侄外孙眷姊"],"xb,d,s,w,f,m&l":["侄外孙眷妹"],"xb,d,s,w,m":["侄外孙眷女","姻家侄妇"],"xb,d,s,w,m,f&o":["侄外孙眷兄"],"xb,d,s,w,m,f&l":["侄外孙眷弟"],"xb,d,s,w,m,m&o":["侄外孙眷姊"],"xb,d,s,w,m,m&l":["侄外孙眷妹"],"xb,d,s,w,xb":["侄外孙眷孙男"],"xb,d,s,w,xb,w":["侄外孙眷孙妇"],"xb,d,s,w,xs":["侄外孙眷孙女"],"xb,d,s,w,xs,h":["侄外孙眷孙婿"],"xb,d,s,s":["侄外曾孙"],"xb,d,s,s,w":["侄外曾孙妇"],"xb,d,s,s,s":["侄外玄孙"],"xb,d,s,s,d":["侄外玄孙女"],"xb,d,s,d":["侄外曾孙女"],"xb,d,s,d,h":["侄外曾孙婿"],"xb,d,s,d,s":["侄外玄外孙"],"xb,d,s,d,d":["侄外玄外孙女"],"xb,d,d":["侄外孙女","外侄孙女"],"xb,d,d,h":["侄外孙婿","外侄孙婿"],"xb,d,d,h,f":["侄外孙姻男","姻家侄"],"xb,d,d,h,f,f&o":["侄外孙姻兄"],"xb,d,d,h,f,f&l":["侄外孙姻弟"],"xb,d,d,h,f,m&o":["侄外孙姻姊"],"xb,d,d,h,f,m&l":["侄外孙姻妹"],"xb,d,d,h,m":["侄外孙姻女","姻家侄妇"],"xb,d,d,h,m,f&o":["侄外孙姻兄"],"xb,d,d,h,m,f&l":["侄外孙姻弟"],"xb,d,d,h,m,m&o":["侄外孙姻姊"],"xb,d,d,h,m,m&l":["侄外孙姻妹"],"xb,d,d,h,xb":["侄外孙姻孙男"],"xb,d,d,h,xb,w":["侄外孙姻孙妇"],"xb,d,d,h,xs":["侄外孙姻孙女"],"xb,d,d,h,xs,h":["侄外孙姻孙婿"],"xb,d,d,s":["侄外曾外孙"],"xb,d,d,s,w":["侄外曾外孙妇"],"xb,d,d,s,s":["侄外曾外曾孙"],"xb,d,d,s,d":["侄外曾外曾孙女"],"xb,d,d,d":["侄外曾外孙女"],"xb,d,d,d,h":["侄外曾外孙婿"],"xb,d,d,d,s":["侄外曾外曾外孙"],"xb,d,d,d,d":["侄外曾外曾外孙女"],os:["姐姐","姐","阿姊","胞姐","大姐","阿姐","家姐","x姐"],"os,h":["姐夫","姐丈","姐婿","胞姐夫","大姐夫","x姐夫"],ls:["妹妹","妹","胞妹","老妹","阿妹","细妹","x妹"],"ls,h":["妹夫","妹丈","妹婿","胞妹夫","x妹夫"],xs:["姐妹","亲姐妹","同胞姐妹"],"xs,h,f":["姊妹姻父"],"xs,h,f,f":["姊妹姻祖父","姊妹姻奶爷","姊妹姻王父"],"xs,h,f,f,ob":["姊妹姻伯奶爷","姊妹姻伯王父"],"xs,h,f,f,ob,w":["姊妹姻伯奶奶","姊妹姻伯王母"],"xs,h,f,f,lb":["姊妹姻叔奶爷","姊妹姻叔王父"],"xs,h,f,f,lb,w":["姊妹姻叔奶奶","姊妹姻叔王母"],"xs,h,f,f,xs":["姊妹姻姑奶奶","姊妹姻姑王母"],"xs,h,f,f,xs,h":["姊妹姻姑奶爷","姊妹姻姑王父"],"xs,h,f,m":["姊妹姻祖母","姊妹姻奶奶","姊妹姻王母"],"xs,h,f,m,xb":["姊妹姻舅奶爷","姊妹姻舅王父"],"xs,h,f,m,xb,w":["姊妹姻舅奶奶","姊妹姻舅王母"],"xs,h,f,m,xs":["姊妹姻姨奶奶","姊妹姻姨王母"],"xs,h,f,m,xs,h":["姊妹姻姨奶爷","姊妹姻姨王父"],"xs,h,f,ob":["姊妹姻伯父"],"xs,h,f,ob,w":["姊妹姻伯母"],"xs,h,f,lb":["姊妹姻叔父"],"xs,h,f,lb,w":["姊妹姻叔母"],"xs,h,f,xb,s&o":["姊妹姻叔表兄"],"xs,h,f,xb,s&o,w":["姊妹姻叔表兄妇"],"xs,h,f,xb,s&l":["姊妹姻叔表弟"],"xs,h,f,xb,s&l,w":["姊妹姻叔表弟妇"],"xs,h,f,xb,d&o":["姊妹姻叔表姊"],"xs,h,f,xb,d&o,h":["姊妹姻叔表姊婿"],"xs,h,f,xb,d&l":["姊妹姻叔表妹"],"xs,h,f,xb,d&l,h":["姊妹姻叔表妹婿"],"xs,h,f,xs":["姊妹姻姑母"],"xs,h,f,xs,h":["姊妹姻姑父"],"xs,h,f,xs,s&o":["姊妹姻姑表兄"],"xs,h,f,xs,s&o,w":["姊妹姻姑表兄妇"],"xs,h,f,xs,s&l":["姊妹姻姑表弟"],"xs,h,f,xs,s&l,w":["姊妹姻姑表弟妇"],"xs,h,f,xs,d&o":["姊妹姻姑表姊"],"xs,h,f,xs,d&o,h":["姊妹姻姑表姊婿"],"xs,h,f,xs,d&l":["姊妹姻姑表妹"],"xs,h,f,xs,d&l,h":["姊妹姻姑表妹婿"],"xs,h,m":["姊妹姻母"],"xs,h,m,f":["姊妹姻外祖父","姊妹姻姥爷","姊妹姻王父"],"xs,h,m,f,ob":["姊妹姻伯姥爷","姊妹姻伯王父"],"xs,h,m,f,ob,w":["姊妹姻伯姥姥","姊妹姻伯王母"],"xs,h,m,f,lb":["姊妹姻叔姥爷","姊妹姻叔王父"],"xs,h,m,f,lb,w":["姊妹姻叔姥姥","姊妹姻叔王母"],"xs,h,m,f,xs":["姊妹姻姑姥姥","姊妹姻姑王母"],"xs,h,m,f,xs,h":["姊妹姻姑姥爷","姊妹姻姑王父"],"xs,h,m,m":["姊妹姻外祖母","姊妹姻姥姥","姊妹姻王母"],"xs,h,m,m,xb":["姊妹姻舅姥爷","姊妹姻舅王父"],"xs,h,m,m,xb,w":["姊妹姻舅姥姥","姊妹姻舅王母"],"xs,h,m,m,xs":["姊妹姻姨姥姥","姊妹姻姨王母"],"xs,h,m,m,xs,h":["姊妹姻姨姥爷","姊妹姻姨王父"],"xs,h,m,xb":["姊妹姻舅父"],"xs,h,m,xb,w":["姊妹姻舅母"],"xs,h,m,xb,s&o":["姊妹姻舅表兄"],"xs,h,m,xb,s&o,w":["姊妹姻舅表兄妇"],"xs,h,m,xb,s&l":["姊妹姻舅表弟"],"xs,h,m,xb,s&l,w":["姊妹姻舅表弟妇"Line truncated

script/relationship.js

@@ -200,6 +200,21 @@
         '[f|m]':['父母','爹娘','爹妈','爸妈','爸爸妈妈','父母亲','双亲','二亲','两亲','二老','高堂'],
         '[h,f|h,m]':['公婆','翁姑','大家官','公公婆婆','姑嫜'],
         '[w,f|w,m]':['岳父母','岳父岳母','丈人丈母','舅姑'],
+        '[f,ob|f,ob,w]':['伯父母'],
+        '[h,f,ob|h,f,ob,w]':['伯公婆'],
+        '[w,f,ob|w,f,ob,w]':['伯岳公婆'],
+        '[f,lb|f,lb,w]':['叔父母'],
+        '[h,f,lb|h,f,lb,w]':['叔公婆'],
+        '[w,f,lb|w,f,lb,w]':['叔岳父母'],
+        '[f,xs|f,xs,h]':['姑父母'],
+        '[h,f,xs|h,f,xs,h]':['姑公婆'],
+        '[w,f,xs|w,f,xs,h]':['姑岳父母'],
+        '[m,xb|m,xb,h]':['舅父母'],
+        '[h,m,xb|h,m,xb,h]':['舅公婆'],
+        '[w,m,xb|w,m,xb,h]':['舅岳父母'],
+        '[m,xs|m,xs,h]':['姨父母'],
+        '[h,m,xs|h,m,xs,h]':['姨公婆'],
+        '[w,m,xs|w,m,xs,h]':['姨岳父母'],
         '[f,xb,s|f,xb,d|m,xs,s|m,xs,d]':['从兄弟姐妹','从姐妹兄弟'],
         '[f,xb,s|f,xb,d]':['堂兄弟姐妹','堂姐妹兄弟','从父兄弟姐妹'],
         '[m,xs,s|m,xs,d]':['姨兄弟姐妹','姨姐妹兄弟','从母兄弟姐妹'],
@@ -222,6 +237,7 @@
         '[ob|ob,w]':['哥哥嫂嫂'],
         '[xb,s|xb,d]':['侄子女','侄子侄女'],
         '[xs,s|xs,d]':['甥子女','外甥子女'],
+        '[w|s|d]':['妻儿'],
         '[s|d]':['子女','儿女','小孩','孩子','孩子们','孩儿','小孩儿','宝宝','宝贝','娃','儿辈','子辈'],
         '[s,s|s,d|d,s|d,d]':['孙辈'],
         '[s,s|s,d]':['孙子女'],
@@ -936,16 +952,16 @@
         'f,xs,d&o,h':['姑表姐夫','姑表姐丈'],
         'f,xs,d&l':['姑表妹','老表'],
         'f,xs,d&l,h':['姑表妹夫','姑表妹婿'],
-        'f,xs,d,w,f':['姑表姐妹姻父'],
+        'f,xs,d,h,f':['姑表姐妹姻父'],
-        'f,xs,d,w,m':['姑表姐妹姻母'],
+        'f,xs,d,h,m':['姑表姐妹姻母'],
-        'f,xs,d,w,xb&o':['姑表姐妹姻兄'],
+        'f,xs,d,h,xb&o':['姑表姐妹姻兄'],
-        'f,xs,d,w,xb&o,w':['姑表姐妹姻兄妇'],
+        'f,xs,d,h,xb&o,w':['姑表姐妹姻兄妇'],
-        'f,xs,d,w,xb&l':['姑表姐妹姻弟'],
+        'f,xs,d,h,xb&l':['姑表姐妹姻弟'],
-        'f,xs,d,w,xb&l,w':['姑表姐妹姻弟妇'],
+        'f,xs,d,h,xb&l,w':['姑表姐妹姻弟妇'],
-        'f,xs,d,w,xs&o':['姑表姐妹姻姊'],
+        'f,xs,d,h,xs&o':['姑表姐妹姻姊'],
-        'f,xs,d,w,xs&o,h':['姑表姐妹姻姊婿'],
+        'f,xs,d,h,xs&o,h':['姑表姐妹姻姊婿'],
-        'f,xs,d,w,xs&l':['姑表姐妹姻妹'],
+        'f,xs,d,h,xs&l':['姑表姐妹姻妹'],
-        'f,xs,d,w,xs&l,h':['姑表姐妹姻妹婿'],
+        'f,xs,d,h,xs&l,h':['姑表姐妹姻妹婿'],
         'f,xs,d,s':['姑表甥男','姑表外甥','姑舅儿子'],
         'f,xs,d,s,w':['姑表甥妇'],
         'f,xs,d,s,s':['姑表甥孙男'],
@@ -1367,16 +1383,16 @@
         'm,xb,d&o,h':['舅表姐夫','舅表姐丈'],
         'm,xb,d&l':['舅表妹','老表'],
         'm,xb,d&l,h':['舅表妹夫','舅表妹婿'],
-        'm,xb,d,w,f':['舅表姐妹姻父'],
+        'm,xb,d,h,f':['舅表姐妹姻父'],
-        'm,xb,d,w,m':['舅表姐妹姻母'],
+        'm,xb,d,h,m':['舅表姐妹姻母'],
-        'm,xb,d,w,xb&o':['舅表姐妹姻兄'],
+        'm,xb,d,h,xb&o':['舅表姐妹姻兄'],
-        'm,xb,d,w,xb&o,w':['舅表姐妹姻兄妇'],
+        'm,xb,d,h,xb&o,w':['舅表姐妹姻兄妇'],
-        'm,xb,d,w,xb&l':['舅表姐妹姻弟'],
+        'm,xb,d,h,xb&l':['舅表姐妹姻弟'],
-        'm,xb,d,w,xb&l,w':['舅表姐妹姻弟妇'],
+        'm,xb,d,h,xb&l,w':['舅表姐妹姻弟妇'],
-        'm,xb,d,w,xs&o':['舅表姐妹姻姊'],
+        'm,xb,d,h,xs&o':['舅表姐妹姻姊'],
-        'm,xb,d,w,xs&o,h':['舅表姐妹姻姊婿'],
+        'm,xb,d,h,xs&o,h':['舅表姐妹姻姊婿'],
-        'm,xb,d,w,xs&l':['舅表姐妹姻妹'],
+        'm,xb,d,h,xs&l':['舅表姐妹姻妹'],
-        'm,xb,d,w,xs&l,h':['舅表姐妹姻妹婿'],
+        'm,xb,d,h,xs&l,h':['舅表姐妹姻妹婿'],
         'm,xb,d,s':['舅表甥男','舅表外甥','姑舅儿子'],
         'm,xb,d,s,w':['舅表甥妇'],
         'm,xb,d,s,s':['舅表甥孙男'],