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

dist/relationship.min.js

@@ -1,3 +1 @@
-!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 h=f.shift(),w=[],l=[h];for(var e in m){var r=h.replace(e,m[e]),t=h.replace(m[e],e);r!=h&&l.push(r),t!=h&&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 $=o[a];$.indexOf(h)>-1&&w.push(a)}if(!w.length)for(var a in o){var $=o[a];l.forEach(function(s){$.indexOf(s)>-1&&w.push(a)})}w.length||(d=!1);var c=[];x.length||(x=[""]),x.forEach(function(s){w.forEach(function(f){c.push(s+(f?","+f:""))})}),x=c}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],$=r.length>1?"["+r.join("|")+"]":r[0];return{selector:(x?","+$:"")+(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:/(Line truncated
-"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":["伯外曾外祖母","伯太姥姥"],"m,m,f,lb":["叔外曾外祖父","叔太姥爷"],"m,m,f,lb,w":["叔外曾外祖母","叔太姥姥"],"m,m,f,xb,s":["堂舅外祖父","从父舅外祖父"],"m,m,f,xb,s,w":["堂舅外祖母","从父舅外祖母"],"m,m,f,xb,s,s":["堂舅表舅父","从父舅表舅父"],"m,m,f,xb,s,s,w":["堂舅表舅母","从父舅表舅母"],"m,m,f,xb,s,d":["堂舅表姨母","从父舅表姨母"],"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":["舅表舅表甥婿"]Line truncated
-"s,d,h,xs":["孙姻孙女","姻家再侄女","姻家再侄"],"s,d,h,xs,h":["孙姻孙婿"],"s,d,s":["曾外孙"],"s,d,s,w":["曾外孙媳妇"],"s,d,s,s":["曾外曾孙"],"s,d,s,s,w":["曾外曾孙媳妇"],"s,d,s,d":["曾外曾孙女"],"s,d,s,d,h":["曾外曾孙女婿"],"s,d,d":["曾外孙女"],"s,d,d,h":["曾外孙女婿"],"s,d,d,s":["曾外曾外孙"],"s,d,d,s,w":["曾外曾外孙媳妇"],"s,d,d,d":["曾外曾外孙女"],"s,d,d,d,h":["曾外曾外孙女婿"],d:["女儿","千金","掌上明珠","息女","闺女","囡女","乖囡","囡囡","丫头","姑娘","女亲","长女","次女","幼女","女","阿女","女女","x女儿"],"d,h":["女婿","姑爷","女婿子","女婿儿","儿婿","息婿","囝婿","x女婿"],"d,s":["外孙"],"d,s,w":["外孙媳妇","外孙妇","外孙新妇"],"d,s,w,f":["外孙眷男"],"d,s,w,f,f&o":["外孙眷兄"],"d,s,w,f,f&l":["外孙眷弟"],"d,s,w,f,m&o":["外孙眷姊"],"d,s,w,f,m&l":["外孙眷妹"],"d,s,w,m":["外孙眷女"],"d,s,w,m,f&o":["外孙眷兄"],"d,s,w,m,f&l":["外孙眷弟"],"d,s,w,m,m&o":["外孙眷姊"],"d,s,w,m,m&l":["外孙眷妹"],"d,s,w,xb":["外孙眷孙男","姻家再侄男","姻家再侄"],"d,s,w,xb,w":["外孙眷孙妇"],"d,s,w,xs":["外孙眷孙女","姻家再侄女","姻家再侄"],"d,s,w,xs,h":["外孙眷孙婿"],"d,s,s":["外曾孙","重外孙"],"d,s,s,w":["外曾孙媳妇","外曾孙妇"],"d,s,s,s":["外玄孙"],"d,s,s,s,w":["外玄孙媳妇"],"d,s,s,d":["外玄孙女"],"d,s,s,d,h":["外玄孙女婿"],"d,s,d":["外曾孙女","重外孙女"],"d,s,d,h":["外曾孙女婿","重外孙女婿"],"d,s,d,s":["外玄外孙"],"d,s,d,s,w":["外玄外孙媳妇"],"d,s,d,d":["外玄外孙女"],"d,s,d,d,h":["外玄外孙女婿"],"d,d":["外孙女","外孙囡"],"d,d,h":["外孙女婿","外孙婿"],"d,d,h,f":["外孙姻男"],"d,d,h,f,f&o":["外孙姻兄"],"d,d,h,f,f&l":["外孙姻弟"],"d,d,h,f,m&o":["外孙姻姊"],"d,d,h,f,m&l":["外孙姻妹"],"d,d,h,m":["外孙姻女"],"d,d,h,m,f&o":["外孙姻兄"],"d,d,h,m,f&l":["外孙姻弟"],"d,d,h,m,m&o":["外孙姻姊"],"d,d,h,m,m&l":["外孙姻妹"],"d,d,h,xb":["外孙姻孙男","姻家再侄男","姻家再侄"],"d,d,h,xb,w":["外孙姻孙妇"],"d,d,h,xs":["外孙姻孙女","姻家再侄女","姻家再侄"],"d,d,h,xs,h":["外孙姻孙婿"],"d,d,s":["外曾外孙"],"d,d,s,w":["外曾外孙媳妇"],"d,d,s,s":["外曾外曾孙"],"d,d,s,s,w":["外曾外曾孙媳妇"],"d,d,s,d":["外曾外曾孙女"],"d,d,s,d,h":["外曾外曾孙女婿"],"d,d,d":["外曾外孙女"],"d,d,d,h":["外曾外孙女婿"],"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":["男眷外孙婿"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"}],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]":["岳父母","岳父岳母","丈人丈母"],"[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]":["甥子女","外甥子女"],"[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,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":["Line truncated

index.html

@@ -231,8 +231,8 @@
 								<p><span>本程序算法已开源，使用请尊重版权保留出处信息</span></p>
 								<p><span>程序持续更新，如发现错漏可在此</span><a class="text-red" href="https://github.com/mumuy/relationship/issues" rel="nofollow" target="_blank">反馈问题</a></p>
 								<p class="buttons">
-									<a class="github-button" href="https://github.com/mumuy" data-style="mega" data-count-href="/mumuy/followers" data-count-api="/users/mumuy#followers" data-count-aria-label="# followers on GitHub" aria-label="Follow @mumuy on GitHub" rel="nofollow">Follow @mumuy</a>
-									<a class="github-button" href="https://github.com/mumuy/relationship" data-style="mega" data-count-href="/mumuy/relationship/stargazers" data-count-api="/repos/mumuy/relationship#stargazers_count" data-count-aria-label="# stargazers on GitHub" aria-label="Star mumuy/relationship on GitHub" rel="nofollow">Star</a>
+									<a class="github-button" href="https://github.com/mumuy" data-color-scheme="no-preference: light; light: light; dark: dark;" data-size="large" aria-label="Follow @mumuy on GitHub">Follow @mumuy</a>
+									<a class="github-button" href="https://github.com/mumuy/relationship" data-color-scheme="no-preference: light; light: light; dark: dark;" data-icon="octicon-star" data-size="large" data-show-count="true" aria-label="Star mumuy/relationship on GitHub">Star</a>
 								</p>
 								<p>&copy; <a href="http://passer-by.com">passer-by.com</a></p>
 							</div>

script/relationship.js

@@ -449,12 +449,12 @@
         'f,f,m,xs,d,d':['从母姑表姑母'],
         'f,f,m,xs,d,d,h':['从母姑表姑父'],
         // 从父*
-        'f,f,ob':['伯公','伯祖','伯翁','伯爷','伯祖父','伯老爷','大爷爷','大爷','堂祖父','伯爷爷'],
+        'f,f,ob':['伯公','伯祖','伯翁','伯爷','伯祖父','伯老爷','大爷爷','大爷','大公','堂祖父','伯爷爷'],
         'f,f,ob,w':['伯婆','伯祖母','伯奶奶','大奶奶','堂祖母','姆婆'],
         'f,f,lb':['叔公','叔祖','叔翁','叔爷','叔祖父','叔老爷','小爷爷','堂祖父','叔爷爷','叔奶爷'],
         'f,f,lb,w':['叔婆','叔祖母','叔奶奶','小奶奶','堂祖母','婶婆'],
-        'f,f,xb':['堂祖父','从祖祖父','从祖父','x爷爷','x大爷'],
-        'f,f,xb,w':['堂祖母','从祖祖母','从祖母','x奶奶','x大娘'],
+        'f,f,xb':['堂祖父','从祖祖父','从祖父','x爷爷','x大爷','x爷','x公'],
+        'f,f,xb,w':['堂祖母','从祖祖母','从祖母','x奶奶','x大娘','x奶','x婆'],
         // 再从父
         'f,f,xb,s&o':['堂伯','堂伯父','从父伯父','叔伯伯'],
         'f,f,xb,s&o,w':['堂伯母','从父伯母'],
@@ -548,7 +548,7 @@
         'f,f,xs,d,d,d,h':['堂姑表表甥婿','姑表姑表甥婿'],
         // 奶奶
         'f,m':['奶奶','祖母','阿嫲','阿嬷','嫲嫲'],
-        'f,m,f':['曾外祖父','太外公','太姥爷'],
+        'f,m,f':['曾外祖父','太外公','太姥爷','老外公'],
         'f,m,f,f':['曾外曾祖父','祖太爷','祖太爷爷','祖太公','高王父'],
         'f,m,f,m':['曾外曾祖母','祖太太','祖太奶奶','祖太婆','高王母'],
         // 从父*
@@ -595,7 +595,7 @@
         'f,m,f,xs,d,s&l,w':['姑表姨表叔母'],
         'f,m,f,xs,d,d':['姑表姨表姑母'],
         'f,m,f,xs,d,d,h':['姑表姨表姑父'],
-        'f,m,m':['曾外祖母','太外婆','太姥姥'],
+        'f,m,m':['曾外祖母','太外婆','太姥姥','老外婆','老外奶'],
         'f,m,m,f':['曾外曾外祖父','祖太姥爷','祖太公','高王父'],
         'f,m,m,m':['曾外曾外祖母','祖太姥姥','祖太姥娘','祖太婆','高王母'],
         // 舅表*
@@ -642,7 +642,7 @@
         'f,m,m,xs,d,d,h':['再从母姑父'],
         // 舅表*
         'f,m,xb':['舅公','舅祖父','舅老爷','舅爷爷','舅爷','舅祖','舅奶爷','舅爹','太舅父','x舅老爷','x舅公'],
-        'f,m,xb,w':['舅婆','舅祖母','舅奶奶','舅奶','妗婆','妗奶','太舅母'],
+        'f,m,xb,w':['舅婆','舅祖母','舅奶奶','舅奶','妗婆','妗奶','太舅母','x舅婆'],
         // 舅表叔表
         'f,m,xb,s&o':['舅表伯父','舅表伯'],
         'f,m,xb,s&o,w':['舅表伯母'],
@@ -982,7 +982,7 @@
         'm,f,lb':['外叔公','叔外祖父','外叔祖父','叔姥爷','外叔祖','叔外祖','小外公','小姥爷','小外爷'],
         'm,f,lb,w':['外叔婆','叔外祖母','外叔祖母','叔姥姥','外婶婆','小外婆','小姥姥','小姥奶'],
         'm,f,xb':['x外公','x姥爷','x外爷'],
-        'm,f,xb,w':['x外婆','x姥姥','x姥奶'],
+        'm,f,xb,w':['x外婆','x姥姥','x姥奶','x外奶','x姥'],
         // 从父舅表
         'm,f,xb,s':['堂舅','堂舅爸','堂舅父','堂舅舅','从父舅父','叔伯舅父','叔伯舅'],
         'm,f,xb,s,w':['堂舅妈','堂舅母','从父舅母','叔伯舅母'],
@@ -1063,8 +1063,8 @@
         'm,f,xs,d,d,d':['姑表姨表甥女'],
         'm,f,xs,d,d,d,h':['姑表姨表甥婿'],
         // 外婆
-        'm,m':['外婆','外祖母','外王母','阿婆','姥姥','客婆','毑母','毑毑'],
-        'm,m,f':['外曾外祖父','外太外公','外太姥爷','外太外翁'],
+        'm,m':['外婆','外祖母','外王母','阿婆','外奶','姥姥','姥娘','客婆','毑母','毑毑'],
+        'm,m,f':['外曾外祖父','外太外公','外太姥爷','外太外翁','老姥爷'],
         'm,m,f,f':['外曾外曾祖父','祖太爷','祖太爷爷','祖太公','高王父'],
         'm,m,f,m':['外曾外曾祖母','祖太太','祖太奶奶','祖太婆','高王母'],
         // 从父*
@@ -1103,7 +1103,7 @@
         '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':['外曾外祖母','外太外婆','外太姥姥','外太外姆','老姥娘'],
         'm,m,m,f':['外曾外曾外祖父','祖太姥爷','祖太公','高王父'],
         'm,m,m,m':['外曾外曾外祖母','祖太姥姥','祖太姥娘','祖太婆','高王母'],
         // 舅表*
@@ -1149,8 +1149,8 @@
         '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':['外舅公','外舅祖父','外太舅父','舅外祖父','外祖舅父','舅外公','舅外爷','舅姥爷','舅爹','舅公','x舅姥爷'],
+        'm,m,xb,w':['外舅婆','外舅祖母','外太舅母','舅外祖母','外祖舅母','舅外婆','舅外奶','舅姥姥','舅姥','舅婆','妗姥姥','妗姥娘','妗姥','外妗婆','x舅姥姥'],
         // 舅表舅表
         'm,m,xb,s':['舅表舅父','舅表舅爸','舅表舅','舅表舅舅'],
         'm,m,xb,s,w':['舅表舅母','舅表舅妈'],
@@ -1190,8 +1190,8 @@
         'm,m,xb,d,d,d':['舅表姨表甥女'],
         'm,m,xb,d,d,d,h':['舅表姨表甥婿'],
         // 从母*
-        'm,m,xs':['外姨婆','姨外祖母','姨姥姥','外姨祖母','从母姨外祖母'],
-        'm,m,xs,h':['外姨公','姨外祖父','姨姥爷','外姨祖父','从母姨外祖父'],
+        'm,m,xs':['外姨婆','姨外祖母','姨外婆','姨外奶','姨姥姥','姨姥','外姨祖母','从母姨外祖母'],
+        'm,m,xs,h':['外姨公','姨外祖父','姨外公','姨外公','姨姥爷','外姨祖父','从母姨外祖父'],
         // 从母舅表
         'm,m,xs,s':['姨舅父','姨舅爸','姨舅','从母舅父'],
         'm,m,xs,s,w':['姨舅母','从母舅母'],
@@ -2272,8 +2272,8 @@
         '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,f':['男眷祖父','老太姻翁'],
+        's,w,f,f,m':['男眷祖母','老太姻姆'],
         's,w,f,f,ob':['男眷伯父','男姻伯翁'],
         's,w,f,f,ob,w':['男眷伯母','男姻伯姆'],
         's,w,f,f,lb':['男眷叔父','男姻叔翁'],
@@ -2291,8 +2291,8 @@
         '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,m,f':['男眷外祖父','老太姻翁'],
+        's,w,f,m,m':['男眷外祖母','老太姻姆'],
         's,w,f,ob':['男眷叔兄'],
         's,w,f,ob,w':['男眷叔兄妇'],
         's,w,f,lb':['男眷叔弟'],
@@ -2338,8 +2338,8 @@
         '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,f':['女姻祖父','老太姻翁'],
+        'd,h,f,f,m':['女姻祖母','老太姻姆'],
         'd,h,f,f,ob':['女姻伯父','女姻伯翁'],
         'd,h,f,f,ob,w':['女姻伯母','女姻伯姆'],
         'd,h,f,f,lb':['女姻叔父','女姻叔翁'],
@@ -2357,8 +2357,8 @@
         '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,m,f':['女姻外祖父','老太姻翁'],
+        'd,h,f,m,m':['女姻外祖母','老太姻姆'],
         'd,h,f,ob':['女姻叔兄'],
         'd,h,f,ob,w':['女姻叔兄妇'],
         'd,h,f,lb':['女姻叔弟'],

style/index.css

@@ -34,7 +34,7 @@ a:hover{
 }
 
 .mod-head .hd,.mod-head .bd{
-    max-width: 500px;
+    max-width: 540px;
     padding: 0 10px;
 	margin:0 auto;
 }
@@ -95,8 +95,9 @@ a:hover{
 }
 .mod-panel h1{
 	line-height: 32px;
-	font-size: 24px;
-	color:#212121;
+    font-weight: 500;
+    font-size: 22px;
+    color:#333;
 }
 .mod-panel h2{
     line-height: 30px;
@@ -105,7 +106,7 @@ a:hover{
     font-size: 18px;
 }
 .mod-panel .hd,.mod-panel .bd{
-    max-width: 500px;
+    max-width: 540px;
 	margin:0 auto;
 }
 .mod-panel .hd{
@@ -178,7 +179,7 @@ a:hover{
 	display: inline-block;
     width: 100%;
     height: 30px;
-    background: #f8f8f8;
+    background: #fafafa;
     border: 1px solid #e8e8e8;
     padding: 5px 10px;
 	box-sizing: border-box;
@@ -196,7 +197,7 @@ a:hover{
     border: medium none;
     line-height: 30px;
     vertical-align: middle;
-    font-size: 16px;
+    font-size: 15px;
     color: #333333;
     cursor: pointer;
     outline: none;
@@ -239,8 +240,8 @@ a:hover{
 	width: 100%;
 	height: 120px;
 	padding:5px 10px;
-	background: #f8f8f8;
-	border: 1px solid #e8e8e8;
+	background: #fafafa;
+	border: 1px solid #e9e9e9;
 	box-sizing: border-box;
 	border-radius: 5px;
 	resize: none;
@@ -285,28 +286,28 @@ a:hover{
 .mod-panel .intro,.mod-panel .article{
     padding:  10px 20px;
     margin: 10px 0;
-    background: #f5f5f6;
+    background: rgb(246, 248, 250);
     border-radius: 6px;
+    color: rgb(110, 119, 129);
 }
 .mod-panel .intro h3{
     margin-bottom: 10px;
     font-size: 16px;
     font-weight: bold;
+    color: rgba(36, 41, 47, 0.8);
 }
 .mod-panel .intro p{
     line-height: 22px;
 }
-.mod-panel .intro p.q{
-    margin-top: 10px;
-    font-weight: bold;
-}
-.mod-panel .intro p.a{
-    color: #666;
-}
 .mod-panel .article p{
     line-height: 22px;
     text-indent: 2em;
 }
+.mod-panel .intro p.q{
+    margin-top: 10px;
+    font-weight: bold;
+    color: rgba(36, 41, 47, 0.8);
+}
 .mod-panel .table-inner{
     overflow-x: auto;
 }