updated 部分名称错误修复及完善

dist/relationship.min.js

@@ -1 +1,3 @@
-!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"}],h={"":["自己","我","本人","在下"],"[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]":["岳父母","岳父岳母"],"[xb|xs]":["兄弟姐妹","同胞","手足"],"[f,xb,s&o|f,xb,s&l]":["堂兄弟","叔伯兄弟"],"[f,xb,d&o|f,xb,d&l]":["堂姐妹","叔伯姐妹"],"[m,xs,s&o|m,xs,s&l]":["姨兄弟"],"[m,xs,d&o|m,xs,d&l]":["姨姐妹"],"[f,xs,s&o|f,xs,s&l|m,xb,s&o|m,xb,s&l]":["表兄弟"],"[f,xs,d&o|f,xs,d&l|m,xb,d&o|m,xb,d&l]":["表姐妹"],"[ob|os]":["哥哥姐姐"],"[lb|ls]":["弟弟妹妹"],"[s|d]":["子女","儿女","小孩","孩子","孩子们","孩儿","宝宝","宝贝","娃","儿辈","子辈"],"[s,s|s,d|d,s|d,d]":["孙辈"],"[s|d|s,s|s,d|d,s|d,d]":["儿孙","子孙"],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,f,f,f,f,f,f,f,f,lb":["叔鼻祖父"],"f,f,f,f,f,f,f,f,f,lb,w":["叔鼻祖母"],"f,f,f,f,f,f,f,f,f,xs":["姑鼻祖母"],"f,f,f,f,f,f,f,f,f,xs,h":["姑鼻祖父"],"f,f,f,f,f,f,f,f,m":["鼻祖母"],"f,f,f,f,f,f,f,f,m,xb":["舅鼻祖父"],"f,f,f,f,f,f,f,f,m,xb,w":["舅鼻祖母"],"f,f,f,f,f,f,f,f,m,xs":["姨鼻祖母"],"f,f,f,f,f,f,f,f,m,xs,h":["姨鼻祖父"],"f,f,f,f,f,f,f,f,ob":["伯远祖父"],"f,f,f,f,f,f,f,f,ob,w":["伯远祖母"],"f,f,f,f,f,f,f,f,lb":["叔远祖父"],"f,f,f,f,f,f,f,f,lb,w":["叔远祖母"],"f,f,f,f,f,f,f,f,xs":["姑远祖母"],"f,f,f,f,f,f,f,f,xs,h":["姑远祖父"],"f,f,f,f,f,f,f,m":["远祖母"],"f,f,f,f,f,f,f,m,xb":["舅远祖父"],"f,f,f,f,f,f,f,m,xb,w":["舅远祖母"],"f,f,f,f,f,f,f,m,xs":["姨远祖母"],"f,f,f,f,f,f,f,m,xs,h":["姨远祖父"],"f,f,f,f,f,f,f,ob":["伯太祖父"],"f,f,f,f,f,f,f,ob,w":["伯太祖母"],"f,f,f,f,f,f,f,lb":["叔太祖父"],"f,f,f,f,f,f,f,lb,w":["叔太祖母"],"f,f,f,f,f,f,f,xs":["姑太祖母"],"f,f,f,f,f,f,f,xs,h":["姑太祖父"],"f,f,f,f,f,f,m":["太祖母"],"f,f,f,f,f,f,m,xb":["舅太祖父"],"f,f,f,f,f,f,m,xb,w":["舅太祖母"],"f,f,f,f,f,f,m,xs":["姨太祖母"],"f,f,f,f,f,f,m,xs,h":["姨太祖父"],"f,f,f,f,f,f,ob":["伯烈祖父"],"f,f,f,f,f,f,ob,w":["伯烈祖母"],"f,f,f,f,f,f,lb":["叔烈祖父"],"f,f,f,f,f,f,lb,w":["叔烈祖母"],"f,f,f,f,f,f,xs":["姑烈祖母"],"f,f,f,f,f,f,xs,h":["姑烈祖父"],"f,f,f,f,f,m"Line truncated
+!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");for(var f=s.replace(/之/,"的").replace(/我的?(.+)/,"$1").replace(/(?<!娘|婆)家的?/,"的").split("的"),x=[],d=!0,m={"哥":"兄","姐":"姊","媳":"妇","夫":"婿","姪":"侄","姊妹姻":"姻","女姻":"姻","兄弟眷":"眷","男眷":"眷"},b={"媳妇":"妇","女婿":"婿"};f.length;){var h=f.shift(),w=[];for(var l in o){var e=o[l];if(e.indexOf(h)>-1)w.push(l);else{var r=h;for(var t in m)r=r.replace(t,m[t]);for(var t in b)t!=h&&(r=r.replace(t,m[t]));var n=e.map(function(s){for(var f in m)s=s.replace(f,m[f]);return s});n.indexOf(r)>-1&&w.push(l)}}w.length||(d=!1);var a=[];x.length||(x=[""]),x.forEach(function(s){w.forEach(function(f){a.push(s+(f?","+f:""))})}),x=a}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 w=!0;do{b=s;for(var o in h){var l=h[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]);w=!1;break}}}while(b!=s);if(w){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(),h=m.split(",").reverse(),w=[],o=0;o<b.length;o++)w.push(x[b[o]][h[o]]);var l=0,e={f:1,m:1,s:-1,d:-1};return w.forEach(function(s){l+=e[s]||0}),w.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,h=-1;if(s.match(/^,w/)||s.match(/^,1/)?h=1:(s.match(/^,h/)||s.match(/^,0/))&&(h=0),x.match(/^,w/)||x.match(/^,1/)?b=1:(x.match(/^,h/)||x.match(/^,0/))&&(b=0),h==-1&&b>-1)m=b;else if(h>-1&&b==-1)m=h;else{if(h!=b)return!1;m=h}}var w=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?w=-1:t?w=1:n&&(w=0)}else r=[""];var a=o.length>1?"["+o.join("|")+"]":o[0],p=r.length>1?"["+r.join("|")+"]":r[0];return{selector:(x?","+p:"")+(s?","+a:""),sex:w}}var h=[{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:""},{expLine truncated
+"m,m,f,xb,s,d,h":["堂舅表姨父","从父舅表姨父"],"m,m,f,xb,d":["堂姨外祖母","从父姨外祖母"],"m,m,f,xb,d,h":["堂姨外祖父","从父姨外祖父"],"m,m,f,xb,d,s":["堂姨表舅父","从父姨表舅父"],"m,m,f,xb,d,s,w":["堂姨表舅母","从父姨表舅母"],"m,m,f,xb,d,d":["堂姨表姨母","从父姨表姨母"],"m,m,f,xb,d,d,h":["堂姨表姨父","从父姨表姨父"],"m,m,f,xs":["姑外曾外祖母","姑太姥姥"],"m,m,f,xs,h":["姑外曾外祖父","姑太姥爷"],"m,m,f,xs,s":["姑表舅外祖父"],"m,m,f,xs,s,w":["姑表舅外祖母"],"m,m,f,xs,s,s":["姑表舅表舅父"],"m,m,f,xs,s,s,w":["姑表舅表舅母"],"m,m,f,xs,s,d":["姑表舅表姨母"],"m,m,f,xs,s,d,h":["姑表舅表姨父"],"m,m,f,xs,d":["姑表姨外祖母"],"m,m,f,xs,d,h":["姑表姨外祖父"],"m,m,f,xs,d,s":["姑表姨表舅父"],"m,m,f,xs,d,s,w":["姑表姨表舅母"],"m,m,f,xs,d,d":["姑表姨表姨母"],"m,m,f,xs,d,d,h":["姑表姨表姨父"],"m,m,m":["外曾外祖母","外太外婆","外太姥姥","外太外婆"],"m,m,m,f":["外曾外曾外祖父","祖太姥爷","祖太公","高王父"],"m,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,s,s":["舅表舅表舅父"],"m,m,m,xb,s,s,w":["舅表舅表舅母"],"m,m,m,xb,s,d":["舅表舅表姨母"],"m,m,m,xb,s,d,h":["舅表舅表姨父"],"m,m,m,xb,d":["舅表姨外祖母"],"m,m,m,xb,d,h":["舅表姨外祖父"],"m,m,m,xb,d,s":["舅表姨表舅父"],"m,m,m,xb,d,s,w":["舅表姨表舅母"],"m,m,m,xb,d,d":["舅表姨表姨母"],"m,m,m,xb,d,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,s,s":["从母舅表舅父"],"m,m,m,xs,s,s,w":["从母舅表舅母"],"m,m,m,xs,s,d":["从母舅表姨母"],"m,m,m,xs,s,d,h":["从母舅表姨父"],"m,m,m,xs,d":["从母姨外祖母","从母姨姥姥"],"m,m,m,xs,d,h":["从母姨外祖父","从母姨姥爷"],"m,m,m,xs,d,s":["再从母舅父"],"m,m,m,xs,d,s,w":["再从母舅母"],"m,m,m,xs,d,d":["再从母姨母"],"m,m,m,xs,d,d,h":["再从母姨父"],"m,m,m,xs,d,d,s&o":["三从母兄"],"m,m,m,xs,d,d,s&o,w":["三从母嫂"],"m,m,m,xs,d,d,s&l":["三从母弟"],"m,m,m,xs,d,d,s&l,w":["三从母弟媳"],"m,m,m,xs,d,d,d&o":["三从母姊"],"m,m,m,xs,d,d,d&o,h":["三从母姊夫"],"m,m,m,xs,d,d,d&l":["三从母妹"],"m,m,m,xs,d,d,d&l,h":["三从母妹夫"],"m,m,xb":["外舅公","外舅祖父","外太舅父","舅外祖父","舅姥爷","舅外公","舅公","x舅姥爷"],"m,m,xb,w":["外舅婆","外舅祖母","外太舅母","舅外祖母","舅姥姥","舅婆","外妗婆"],"m,m,xb,s":["舅表舅父","舅表舅爸","表舅父","表舅爸","表舅","表舅舅","舅表舅舅"],"m,m,xb,s,w":["舅表舅母","舅表舅妈","表舅母","表舅妈"],"m,m,xb,s,s&o":["舅表舅表哥"],"m,m,xb,s,s&o,w":["舅表舅表嫂"],"m,m,xb,s,s&l":["舅表舅表弟"],"m,m,xb,s,s&l,w":["舅表舅表弟媳"],"m,m,xb,s,s,s":["舅表舅表侄男"],"m,m,xb,s,s,s,w":["舅表舅表侄妇"],"m,m,xb,s,s,d":["舅表舅表侄女"],"m,m,xb,s,s,d,h":["舅表舅表侄婿"],"m,m,xb,s,d&o":["舅表舅表姐"],"m,m,xb,s,d&o,h":["舅表舅表姐夫"],"m,m,xb,s,d&l":["舅表舅表妹"],"m,m,xb,s,d&l,h":["舅表舅表妹夫"],"m,m,xb,s,d,s":["舅表舅表甥男"],"m,m,xb,s,d,s,w":["舅表舅表甥妇"],"m,m,xb,s,d,d":["舅表舅表甥女"],"m,m,xb,s,d,d,h":["舅表舅表甥婿"],"m,m,xb,d":["舅表姨母","舅表姨妈","表姨母","表姨妈","表姨","表阿姨","舅表姨姨"],"m,m,xb,d,h":["舅表姨父","舅表姨丈","表姨父","表姨丈"],"m,m,xb,d,s&o":["舅表姨表哥"],"m,m,xb,d,s&o,w":["舅表姨表嫂"],"m,m,xb,d,s&l":["舅表姨表弟"],"m,m,xb,d,s&l,w":["舅表姨表弟媳"],"m,m,xb,d,s,s":["舅表姨表侄男"],"m,m,xb,d,s,s,w":["舅表姨表侄妇"],"m,m,xb,d,s,d":["舅表姨表侄女"],"m,m,xb,d,s,d,h":["舅表姨表侄婿"],"m,m,xb,d,d&o":["舅表姨表姐"],"m,m,xb,d,d&o,h":["舅表姨表姐夫"],"m,m,xb,d,d&l":["舅表姨表妹"],"m,m,xb,d,d&l,h":["舅表姨表妹夫"],"m,m,xb,d,d,s":["舅表姨表甥男"],"m,m,xb,d,d,s,w":["舅表姨表甥妇"],"m,m,xb,d,d,d":["舅表姨表甥女"],"m,m,xb,d,d,d,h":["舅表姨表甥婿"],"m,m,xs":["外姨婆","姨外祖母","姨姥姥","外姨祖母","从母姨外祖母"],"m,m,xs,h":["外姨公","姨外祖父","姨姥爷","外姨祖父","从母姨外祖父"],"m,m,xs,s":["姨舅父","姨舅","从母舅父"],"m,m,xs,s,w":["姨舅母","从母舅母"],"m,m,xs,s,s&o":["从母舅表哥"],"m,m,xs,s,s&o,w":["从母舅表嫂"],"m,m,xs,s,s&l":["从母舅表弟"],"m,m,xs,s,s&l,w":["从母舅表弟媳"],"m,m,xs,s,s,s":["从母舅表侄男"],"m,m,xs,s,s,s,w":["从母舅表侄妇"],"m,m,xs,s,s,d":["从母舅表侄女"],"m,m,xs,s,s,d,h":["从母舅表侄婿"],"m,m,xs,sLine truncated
+"d,d,d,s":["外曾外曾外孙"],"d,d,d,s,w":["外曾外曾外孙媳妇"],"d,d,d,d":["外曾外曾外孙女"],"d,d,d,d,h":["外曾外曾外孙女婿"],"s,w,f":["亲家公","亲家翁","姻翁","亲家"],"s,w,f&o":["男眷兄","息眷兄"],"s,w,f&l":["男眷弟","息眷弟"],"s,w,f,f":["男眷父","太姻翁"],"s,w,f,f,f":["老太姻翁"],"s,w,f,f,m":["老太姻姆"],"s,w,f,f,ob":["男眷伯父","姻伯翁"],"s,w,f,f,ob,w":["男眷伯母","姻伯姆"],"s,w,f,f,lb":["男眷叔父","姻叔翁"],"s,w,f,f,lb,w":["男眷叔母","姻叔姆"],"s,w,f,f,xb,s&o":["男眷家兄"],"s,w,f,f,xb,s&o,w":["男眷家兄妇"],"s,w,f,f,xb,s&l":["男眷家弟"],"s,w,f,f,xb,s&l,w":["男眷家弟妇"],"s,w,f,f,xb,s,s":["男眷侄男"],"s,w,f,f,xb,s,d":["男眷侄女"],"s,w,f,f,xb,d&o":["男眷家姊"],"s,w,f,f,xb,d&o,w":["男眷家姊婿"],"s,w,f,f,xb,d&l":["男眷家妹"],"s,w,f,f,xb,d&l,w":["男眷家妹婿"],"s,w,f,f,xb,d,s":["男眷甥男"],"s,w,f,f,xb,d,d":["男眷甥女"],"s,w,f,m":["男眷母","太姻姆"],"s,w,f,m,f":["老太姻翁"],"s,w,f,m,m":["老太姻姆"],"s,w,f,ob":["男眷叔兄"],"s,w,f,ob,w":["男眷叔兄妇"],"s,w,f,lb":["男眷叔弟"],"s,w,f,lb,w":["男眷叔弟妇"],"s,w,f,xb,s":["男眷叔男"],"s,w,f,xb,d":["男眷叔女"],"s,w,f,os":["男眷姑姊"],"s,w,f,os,h":["男眷姑姊婿"],"s,w,f,ls":["男眷姑妹"],"s,w,f,ls,h":["男眷姑妹婿"],"s,w,f,xs,s":["男眷姑男"],"s,w,f,xs,d":["男眷姑女"],"s,w,m":["亲家母","亲家姆","姻姆","亲家"],"s,w,m&o":["男眷姊","息眷姊"],"s,w,m&l":["男眷妹","息眷妹"],"s,w,m,f":["男眷父","太姻翁"],"s,w,m,m":["男眷母","太姻姆"],"s,w,m,ob":["男眷舅兄"],"s,w,m,ob,w":["男眷舅兄妇"],"s,w,m,lb":["男眷舅弟"],"s,w,m,lb,w":["男眷舅弟妇"],"s,w,m,xb,s":["男眷舅男"],"s,w,m,xb,d":["男眷舅女"],"s,w,m,os":["男眷姨姊"],"s,w,m,os,h":["男眷姨姊婿"],"s,w,m,ls":["男眷姨妹"],"s,w,m,ls,h":["男眷姨妹婿"],"s,w,m,xs,s":["男眷姨男"],"s,w,m,xs,d":["男眷姨女"],"s,w,xb":["男眷男","息眷男"],"s,w,xb,w":["男眷妇","息眷妇"],"s,w,xb,s":["男眷孙男","息眷孙男"],"s,w,xb,s,w":["男眷孙妇","息眷孙妇"],"s,w,xb,d":["男眷孙女","息眷孙女"],"s,w,xb,d,h":["男眷孙婿","息眷孙婿"],"s,w,xs":["男眷女","息眷女"],"s,w,xs,h":["男眷婿","息眷婿"],"s,w,xs,s":["男眷外孙男","息眷外孙男"],"s,w,xs,s,w":["男眷外孙妇","息眷外孙妇"],"s,w,xs,d":["男眷外孙女","息眷外孙女"],"s,w,xs,d,h":["男眷外孙婿","息眷外孙婿"],"d,h,f":["亲家公","亲家翁","姻翁","亲家"],"d,h,f&o":["女姻兄","息姻兄"],"d,h,f&l":["女姻弟","息姻弟"],"d,h,f,f":["女姻父","太姻翁"],"d,h,f,f,f":["老太姻翁"],"d,h,f,f,m":["老太姻姆"],"d,h,f,f,ob":["女姻伯父","姻伯翁"],"d,h,f,f,ob,w":["女姻伯母","姻伯姆"],"d,h,f,f,lb":["女姻叔父","姻叔翁"],"d,h,f,f,lb,w":["女姻叔母","姻叔姆"],"d,h,f,f,xb,s&o":["女姻家兄"],"d,h,f,f,xb,s&o,w":["女姻家兄妇"],"d,h,f,f,xb,s&l":["女姻家弟"],"d,h,f,f,xb,s&l,w":["女姻家弟妇"],"d,h,f,f,xb,s,s":["女姻侄男"],"d,h,f,f,xb,s,d":["女姻侄女"],"d,h,f,f,xb,d&o":["女姻家姊"],"d,h,f,f,xb,d&o,w":["女姻家姊婿"],"d,h,f,f,xb,d&l":["女姻家妹"],"d,h,f,f,xb,d&l,w":["女姻家妹婿"],"d,h,f,f,xb,d,s":["女姻甥男"],"d,h,f,f,xb,d,d":["女姻甥女"],"d,h,f,m":["女姻母","太姻姆"],"d,h,f,m,f":["老太姻翁"],"d,h,f,m,m":["老太姻姆"],"d,h,f,ob":["女姻叔兄"],"d,h,f,ob,w":["女姻叔兄妇"],"d,h,f,lb":["女姻叔弟"],"d,h,f,lb,w":["女姻叔弟妇"],"d,h,f,xb,s":["女姻叔男"],"d,h,f,xb,d":["女姻叔女"],"d,h,f,os":["女姻姑姊"],"d,h,f,os,h":["女姻姑姊婿"],"d,h,f,ls":["女姻姑妹"],"d,h,f,ls,h":["女姻姑妹婿"],"d,h,f,xs,s":["女姻姑男"],"d,h,f,xs,d":["女姻姑女"],"d,h,m":["亲家母","亲家姆","姻姆","亲家"],"d,h,m&o":["女姻姊","息姻姊"],"d,h,m&l":["女姻妹","息姻妹"],"d,h,m,f":["女姻父","太姻翁"],"d,h,m,m":["女姻母","太姻姆"],"d,h,m,ob":["女姻舅兄"],"d,h,m,ob,w":["女姻舅兄妇"],"d,h,m,lb":["女姻舅弟"],"d,h,m,lb,w":["女姻舅弟妇"],"d,h,m,xb,s":["女姻舅男"],"d,h,m,xb,d":["女姻舅女"],"d,h,m,os":["女姻姨姊"],"d,h,m,os,h":["女姻姨姊婿"],"d,h,m,ls":["女姻姨妹"],"d,h,m,ls,h":["女姻姨妹婿"],"d,h,m,xs,s":["女姻姨男"],"d,h,m,xs,d":["女姻姨女"],"d,h,xb":["女姻男","息姻男"],"d,h,xb,w":["女姻妇","息姻妇"],"d,h,xb,s":["女姻孙男","息姻孙男"],"d,h,xb,s,w":["女姻孙妇","息姻孙妇"],"d,h,xb,d":["女姻孙女","息姻孙女"],"d,h,xb,d,h":["女姻孙婿","息姻孙婿"],"d,h,xs":["女姻女","息姻女"],"d,h,xs,h":["女姻婿","息姻婿"],"d,h,xs,s":["女姻外孙男","息姻外孙男"],"d,h,xs,s,w":["女姻外孙妇","息姻外孙妇"],"d,h,xs,d":["女姻外孙女","息姻外孙女"],"d,h,xs,d,h":["女姻外孙婿","息姻外孙婿"]},o=Object.assign({},w),l={},e=function(s){for(var f,x=[],d={},m=0;null!=(f=s[m]);m++){var b=f.replace(/[ol](?=s|b)/,"x").replace(/&[ol]/Line truncated

script/relationship.js

@@ -209,9 +209,9 @@
         '[s,s|s,d|d,s|d,d]':['孙辈'],
         '[s|d|s,s|s,d|d,s|d,d]':['儿孙','子孙'],
         // 本家
-        'f':['爸爸','父亲','老爸','阿爸','阿爹','老窦','爸','父','爹','爹爹','爹地','爹啲','老爹','大大','老爷子'],
+        'f':['爸爸','父亲','老爸','阿爸','阿爹','老窦','老汉','爸','父','爹','爹爹','爹地','爹啲','老爹','大大','老爷子'],
         // 爷爷
-        'f,f':['爷爷','祖父','奶爷','阿爷','阿公','吖爷','老爷'],
+        'f,f':['爷爷','祖父','奶爷','阿爷','阿公','老爷'],
         'f,f,f':['曾祖父','曾祖','太公','太爷','太爷爷','祖公','祖奶爷','太老爷'],
         'f,f,f,f':['高祖父','老太奶爷','老太爷','祖太爷','祖太爷爷','祖太公','高王父'],
         'f,f,f,f,f':['天祖父','高祖'],
@@ -531,7 +531,7 @@
         'f,f,xs,d,d,d':['堂姑表表甥女','姑表姑表甥女'],
         'f,f,xs,d,d,d,h':['堂姑表表甥婿','姑表姑表甥婿'],
         // 奶奶
-        'f,m':['奶奶','祖母','阿嫲','阿嬷','嫲嫲','吖麻'],
+        'f,m':['奶奶','祖母','阿嫲','阿嬷','嫲嫲'],
         'f,m,f':['曾外祖父','太外公','太姥爷'],
         'f,m,f,f':['曾外曾祖父','祖太爷','祖太爷爷','祖太公','高王父'],
         'f,m,f,m':['曾外曾祖母','祖太太','祖太奶奶','祖太婆','高王母'],
@@ -960,7 +960,7 @@
         'm,f,ob':['外伯公','伯外祖父','外伯祖父','伯姥爷','外伯祖','伯外祖','大外公','大姥爷','大外爷'],
         'm,f,ob,w':['外伯婆','伯外祖母','外伯祖母','伯姥姥','外姆婆','大外婆','大姥姥','大姥奶'],
         'm,f,lb':['外叔公','叔外祖父','外叔祖父','叔姥爷','外叔祖','叔外祖','小外公','小姥爷','小外爷'],
-        'm,f,lb,w':['外叔婆','叔外祖母','外叔祖母','叔姥姥','小姥姥','外姆婆','小外婆','小姥姥','小姥奶'],
+        'm,f,lb,w':['外叔婆','叔外祖母','外叔祖母','叔姥姥','外婶婆','小外婆','小姥姥','小姥奶'],
         'm,f,xb':['x外公','x姥爷','x外爷'],
         'm,f,xb,w':['x外婆','x姥姥','x姥奶'],
         // 从父舅表
@@ -1488,7 +1488,7 @@
         'h,m,xs,d,d':['姨夫甥女','从母夫甥女'],
         'h,ob':['大伯子','大伯哥','大伯兄','夫兄'],
         'h,ob,w':['大婶子','伯嫂','大伯嫂','大伯兄妇','大伯妇','伯娘','大伯娘','大嫂','夫兄嫂','妯娌'],
-        'h,lb':['小叔子','小叔弟'],
+        'h,lb':['小叔子','小叔弟','夫弟'],
         'h,lb,w':['小婶子','小婶','叔嫂','小叔妇','小叔媳妇','小叔弟妇','妯娌'],
         'h,xb':['伯叔'],
         'h,xb,s':['婆家侄','叔侄男','叔伯男','从男','婆家侄男'],
@@ -1642,7 +1642,7 @@
         'w,xs,d,d':['内甥外孙女','姨甥外孙女'],
         'w,xs,d,d,h':['内甥外孙婿','姨甥外孙婿'],
         // 兄弟
-        'ob':['哥哥','哥','兄','老哥','兄长','阿哥','大佬','吖哥','胞哥','大哥','x哥'],
+        'ob':['哥哥','哥','兄','老哥','兄长','阿哥','大佬','胞哥','大哥','x哥'],
         'ob,w':['嫂子','嫂','嫂嫂','兄嫂','兄妇','兄妻','大嫂','阿嫂','x嫂'],
         'lb':['弟弟','弟','胞弟','老弟','阿弟','细佬','x弟'],
         'lb,w':['弟妹','弟媳','弟媳妇','弟妇','x弟妹'],
@@ -1865,9 +1865,9 @@
         'xb,d,d,d,s':['侄外曾外曾外孙'],
         'xb,d,d,d,d':['侄外曾外曾外孙女'],
         // 姐妹
-        'os':['姐姐','姐','阿姊','胞姐','大姐','阿姐','家姐','吖姐','x姐'],
+        'os':['姐姐','姐','阿姊','胞姐','大姐','阿姐','家姐','x姐'],
         'os,h':['姐夫','姊夫','姊丈','姊婿','大姐夫','x姐夫'],
-        'ls':['妹妹','妹','胞妹','老妹','阿妹','细妹','吖妹','x妹'],
+        'ls':['妹妹','妹','胞妹','老妹','阿妹','细妹','x妹'],
         'ls,h':['妹夫','妹丈','妹婿','x妹夫'],
         'xs':['姐妹'],
         'xs,h,f':['姊妹姻父'],
@@ -2168,7 +2168,7 @@
         's,d,d,d':['曾外曾外孙女'],
         's,d,d,d,h':['曾外曾外孙女婿'],
         'd':['女儿','千金','掌上明珠','息女','闺女','囡女','乖囡','囡囡','丫头','姑娘','女','阿女','女女','x女儿'],
-        'd,h':['女婿','姑爷','女婿子','女婿儿','儿婿','息婿','x女婿'],
+        'd,h':['女婿','姑爷','女婿子','女婿儿','儿婿','息婿','囝婿','x女婿'],
         'd,s':['外孙'],
         'd,s,w':['外孙媳妇','外孙妇','外孙新妇'],
         'd,s,s':['外曾孙','重外孙'],