正则修复

dist/relationship.js

@@ -166,11 +166,11 @@
 			str:''
 		},
 		{//并列关系处理1
-			exp:/(.+)?\[([^\|]+)\|(.+\|.+)?\](.+)?/g,
+			exp:/(.+)?\[([^\|]+?)\|(.+?\|.+?)?\](.+)?/g,
 			str:'$1$2$4#$1[$3]$4'
 		},
 		{//并列关系处理2
-			exp:/(.+)?\[([^\[\]\|]+)\|([^\[\]\|]+)?\](.+)?/g,
+			exp:/(.+)?\[([^\[\]\|]+?)\|([^\[\]\|]+?)?\](.+)?/g,
 			str:'$1$2$4#$1$3$4'
 		}
 	];

dist/relationship.min.js

@@ -1,2 +1,2 @@
-!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(/家的?/,"的").split("的"),x=[],m=!0;f.length;){var d=f.shift(),b=[],h=!1;for(var l in w){var o=w[l];o.indexOf(d)>-1&&(!l&&f.length||b.push(l),h=!0)}if(h||(m=!1),x.length){for(var e=[],l=0;l<x.length;l++)for(var r=0;r<b.length;r++)e.push(x[l]+","+b[r]);x=e}else for(var l=0;l<b.length;l++)x.push(","+b[l])}return m?x:[]}function f(s,f){var x=[],m={};if(f<0?0==s.indexOf(",w")?s=",1"+s:0==s.indexOf(",h")&&(s=",0"+s):0==s.indexOf(",1")||0==s.indexOf(",0")||f>-1&&(s=","+f+s),s.match(/,[w0],w|,[h1],h/))return!1;var d=function(s){var f="";if(!m[s]){m[s]=!0;var w=!0;do{f=s;for(var h in b){var l=b[h];if(s=s.replace(l.exp,l.str),s.indexOf("#")>-1){for(var o=s.split("#"),e=0;e<o.length;e++)d(o[e]);w=!1;break}}}while(f!=s);if(w){if(s.match(/,[w0],w|,[h1],h/))return!1;s=s.replace(/,[01]/,"").substr(1),x.push(s)}}};return d(s),h(x)}function x(s){var f=[],x=function(s){var f=[];for(var x in w)if(x.replace(/&[ol]/g,"")==s)f.push(w[x][0]);else for(var m=s;m.match(/[ol](b|s)/);)if(m=m.replace(/[ol](b|s)/,"x$1"),m==x){f.push(w[x][0]);break}return f};if(w[s])f.push(w[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 m=s.replace(/x/g,"l");f=x(m);var d=s.replace(/x/g,"o");f=f.concat(x(d))}return f}function m(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"]},m="";if(s.indexOf("&o")>-1?m="&l":s.indexOf("&l")>-1&&(m="&o"),s){s=s.replace(/&[ol]/g,""),f=f?1:0;var d=(","+f+","+s).replace(/,[fhs]|,[olx]b/g,",1").replace(/,[mwd]|,[olx]s/g,",0");d=d.substring(0,d.lastIndexOf(","));for(var b=s.split(",").reverse(),w=d.split(",").reverse(),h=[],l=0;l<b.length;l++)h.push(x[b[l]][w[l]]);return h.join(",")+m}return""}function d(s){for(var f=s.split(","),x=[],m=0;m<f.length;m++){var d=f[m].replace(/&[ol]/,"");x.push(w[d][0])}return x.join("的")}var b=[{exp:/^(.+)&o([^#]+)&l/g,str:"$1$2"},{exp:/^(.+)&l([^#]+)&o/g,str:"$1$2"},{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|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]":["堂姐妹"],"[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]":["表姐妹"],"[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,fLine 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(/家的?/,"的").split("的"),x=[],m=!0;f.length;){var d=f.shift(),b=[],h=!1;for(var l in w){var o=w[l];o.indexOf(d)>-1&&(!l&&f.length||b.push(l),h=!0)}if(h||(m=!1),x.length){for(var e=[],l=0;l<x.length;l++)for(var r=0;r<b.length;r++)e.push(x[l]+","+b[r]);x=e}else for(var l=0;l<b.length;l++)x.push(","+b[l])}return m?x:[]}function f(s,f){var x=[],m={};if(f<0?0==s.indexOf(",w")?s=",1"+s:0==s.indexOf(",h")&&(s=",0"+s):0==s.indexOf(",1")||0==s.indexOf(",0")||f>-1&&(s=","+f+s),s.match(/,[w0],w|,[h1],h/))return!1;var d=function(s){var f="";if(!m[s]){m[s]=!0;var w=!0;do{f=s;for(var h in b){var l=b[h];if(s=s.replace(l.exp,l.str),s.indexOf("#")>-1){for(var o=s.split("#"),e=0;e<o.length;e++)d(o[e]);w=!1;break}}}while(f!=s);if(w){if(s.match(/,[w0],w|,[h1],h/))return!1;s=s.replace(/,[01]/,"").substr(1),x.push(s)}}};return d(s),h(x)}function x(s){var f=[],x=function(s){var f=[];for(var x in w)if(x.replace(/&[ol]/g,"")==s)f.push(w[x][0]);else for(var m=s;m.match(/[ol](b|s)/);)if(m=m.replace(/[ol](b|s)/,"x$1"),m==x){f.push(w[x][0]);break}return f};if(w[s])f.push(w[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 m=s.replace(/x/g,"l");f=x(m);var d=s.replace(/x/g,"o");f=f.concat(x(d))}return f}function m(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"]},m="";if(s.indexOf("&o")>-1?m="&l":s.indexOf("&l")>-1&&(m="&o"),s){s=s.replace(/&[ol]/g,""),f=f?1:0;var d=(","+f+","+s).replace(/,[fhs]|,[olx]b/g,",1").replace(/,[mwd]|,[olx]s/g,",0");d=d.substring(0,d.lastIndexOf(","));for(var b=s.split(",").reverse(),w=d.split(",").reverse(),h=[],l=0;l<b.length;l++)h.push(x[b[l]][w[l]]);return h.join(",")+m}return""}function d(s){for(var f=s.split(","),x=[],m=0;m<f.length;m++){var d=f[m].replace(/&[ol]/,"");x.push(w[d][0])}return x.join("的")}var b=[{exp:/^(.+)&o([^#]+)&l/g,str:"$1$2"},{exp:/^(.+)&l([^#]+)&o/g,str:"$1$2"},{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|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]":["堂姐妹"],"[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]":["表姐妹"],"[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,Line truncated
 "h,xs,d,h":["姑甥婿"],"h,xs,d,s":["姑甥外孙男"],"h,xs,d,s,w":["姑甥外孙妇"],"h,xs,d,d":["姑甥外孙女"],"h,xs,d,d,h":["姑甥外孙婿"],w:["老婆","妻子","太太","媳妇儿","媳妇","夫人","女人","婆娘","妻","内人","娘子","爱人","爱妻","老伴","老太婆"],"w,f":["岳父","岳丈","老丈人","丈人","泰山","妻父"],"w,f,f":["祖岳父","太岳父","奶岳父"],"w,f,f,f":["曾祖丈人"],"w,f,f,m":["曾祖丈母"],"w,f,f,f,xb,s,s&o":["姻伯丈"],"w,f,f,f,xb,s,s&o,w":["姻伯丈"],"w,f,f,f,xb,s,s&l":["姻叔丈"],"w,f,f,f,xb,s,s&l,w":["姻婶"],"w,f,f,ob":["伯祖岳父","太伯岳"],"w,f,f,ob,w":["伯祖岳母","太伯岳母"],"w,f,f,lb,":["叔祖岳父","太叔岳"],"w,f,f,lb,w":["叔祖岳母","太叔岳母"],"w,f,f,xb,s&o":["姻伯"],"w,f,f,xb,s&o,w":["姻姆"],"w,f,f,xb,s&l":["姻叔"],"w,f,f,xb,s&l,w":["姻婶"],"w,f,f,xs":["姑祖岳父母","太姑岳母"],"w,f,f,xs,h":["姑祖岳父","太姑岳父"],"w,f,m":["祖岳母","太岳母","奶岳母"],"w,f,m,f":["曾外祖丈人"],"w,f,m,m":["曾外祖丈母"],"w,f,m,xb":["舅祖岳父","太舅岳父"],"w,f,m,xb,w":["舅祖岳母","太舅岳母"],"w,f,m,xs":["姨祖岳母","太姨岳母"],"w,f,m,xs,h":["姨祖岳父","太姨岳父"],"w,f,xb,s&o":["堂大舅兄","从父大舅兄","堂大舅","堂内兄"],"w,f,xb,s&o,w":["堂内嫂","从父内嫂"],"w,f,xb,s&l":["堂小舅弟","从父小舅弟","堂舅仔","堂内弟"],"w,f,xb,s&l,w":["堂内弟妇","从父内弟妇"],"w,f,xb,d&o":["堂大姨姊","从父大姨姊","堂大姨","堂内姐"],"w,f,xb,d&o,h":["堂父襟兄","从父襟兄"],"w,f,xb,d&l":["堂小姨妹","从父小姨妹","堂姨仔","堂内妹"],"w,f,xb,d&l,h":["堂襟弟","从父襟弟"],"w,f,ob":["伯岳","伯岳父"],"w,f,ob,w":["伯岳母"],"w,f,lb":["叔岳","叔岳父"],"w,f,lb,w":["叔岳母"],"w,f,xs":["姑岳母"],"w,f,xs,h":["姑岳父"],"w,f,xs,s&o":["姑表大舅兄","表大舅","表内兄"],"w,f,xs,s&o,w":["姑表内嫂","表内嫂"],"w,f,xs,s&l":["姑表小舅弟","表舅仔","表内弟"],"w,f,xs,s&l,w":["姑表内弟妇","表内弟妇"],"w,f,xs,d&o":["姑表大姨姊","表大姨","表内姐"],"w,f,xs,d&o,h":["姑表襟兄","表襟兄"],"w,f,xs,d&l":["姑表小姨妹","表姨仔","表内妹"],"w,f,xs,d&l,h":["姑表襟弟","表襟弟"],"w,m":["岳母","丈母娘","丈母","泰水"],"w,m,f":["外祖岳父","外太岳父","姥岳父"],"w,m,f,f":["外曾祖丈人"],"w,m,f,m":["外曾祖丈母"],"w,m,f,ob":["伯外祖岳父"],"w,m,f,ob,w":["伯外祖岳母"],"w,m,f,lb":["叔外祖岳父"],"w,m,f,lb,w":["叔外祖岳母"],"w,m,f,xs":["姑外祖岳母"],"w,m,f,xs,h":["姑外祖岳父"],"w,m,m":["外祖岳母","外太岳母","姥岳母"],"w,m,m,f":["外曾外祖丈人"],"w,m,m,m":["外曾外祖丈母"],"w,m,m,xb":["舅外祖岳父"],"w,m,m,xb,w":["舅外祖岳母"],"w,m,m,xs":["姨外祖岳母"],"w,m,m,xs,h":["姨外祖岳父"],"w,m,xb":["舅岳父"],"w,m,xb,w":["舅岳母"],"w,m,xb,s&o":["舅表大舅兄","表大舅","表内兄"],"w,m,xb,s&o,w":["舅表内嫂","表内嫂"],"w,m,xb,s&l":["舅表小舅弟","表舅仔","表内弟"],"w,m,xb,s&l,w":["舅表内弟妇","表内弟妇"],"w,m,xb,d&o":["舅表大姨姊","表大姨","表内姐"],"w,m,xb,d&o,h":["舅表襟兄","表襟兄"],"w,m,xb,d&l":["舅表小姨妹","表姨仔","表内妹"],"w,m,xb,d&l,h":["舅表襟弟","表襟弟"],"w,m,xs":["姨岳母"],"w,m,xs,h":["姨岳父"],"w,m,xs,s&o":["姨母大舅兄","从母大舅兄","姨大舅","姨内兄"],"w,m,xs,s&o,w":["姨母内嫂","从母内嫂"],"w,m,xs,s&l":["姨小舅弟","从母小舅弟","姨舅仔","姨内弟"],"w,m,xs,s&l,w":["姨内弟妇","从母内弟妇"],"w,m,xs,d&o":["姨大姨姊","从母大姨姊","姨大姨","姨内姐"],"w,m,xs,d&o,h":["姨襟兄","从母襟兄"],"w,m,xs,d&l":["姨小姨妹","从母小姨妹","姨姨仔","姨内妹"],"w,m,xs,d&l,h":["姨襟弟","从母襟弟"],"w,ob":["大舅子","大舅哥","大舅兄","内兄","妻兄","妻舅","舅兄"],"w,ob,w":["舅嫂","大舅妇","大舅嫂","大舅媳妇","大妗子","内嫂","妻兄嫂"],"w,lb":["小舅子","小舅弟","内弟","妻弟","妻舅","舅弟"],"w,lb,w":["舅弟媳","小舅妇","小舅弟妇","小舅媳妇","小妗子","妻妹夫"],"w,xb,s":["内侄男","内侄","妻侄男","舅侄男","岳侄男","丈人侄男","舅男"],"w,xb,s,w":["内侄妇","内侄媳妇","妻侄妇","舅侄妇","岳侄妇","丈人侄妇"],"w,xb,s,s":["内侄孙男","妻侄孙男"],"w,xb,s,s,w":["内侄孙妇","妻侄孙妇"],"w,xb,s,d":["内侄孙女","妻侄孙女"],"w,xb,s,d,h":["内侄孙婿","妻侄孙婿"],"w,xb,d":["内侄女","内侄","妻侄女","舅侄女","岳侄女","丈人侄女","舅女"],"w,xb,d,h":["内侄婿","妻侄婿","舅侄婿","岳侄婿","丈人侄婿"],"w,xb,d,s":["内侄外孙男","姨侄外孙男"],"w,xb,d,s,w":["内侄外孙妇","姨侄外孙妇"],"w,xb,d,d":["内侄外孙女","姨侄外孙女"],"w,xb,d,d,h":["内侄外孙婿","姨侄外孙婿"],"w,os":["大姨子","大姨姐","大姨姊","妻姐"],"w,os,h":["大姨Line truncated

script/relationship.js

@@ -166,11 +166,11 @@
 			str:''
 		},
 		{//并列关系处理1
-			exp:/(.+)?\[([^\|]+)\|(.+\|.+)?\](.+)?/g,
+			exp:/(.+)?\[([^\|]+?)\|(.+?\|.+?)?\](.+)?/g,
 			str:'$1$2$4#$1[$3]$4'
 		},
 		{//并列关系处理2
-			exp:/(.+)?\[([^\[\]\|]+)\|([^\[\]\|]+)?\](.+)?/g,
+			exp:/(.+)?\[([^\[\]\|]+?)\|([^\[\]\|]+?)?\](.+)?/g,
 			str:'$1$2$4#$1$3$4'
 		}
 	];