diff --git a/dist/relationship.js b/dist/relationship.js index 598be31..4e5f7e1 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -774,14 +774,14 @@ 'f,xb,d,h,xs&o,h':['从父姊妹姻姊婿'], 'f,xb,d,h,xs&l':['从父姊妹姻妹'], 'f,xb,d,h,xs&l,h':['从父姊妹姻妹婿'], - 'f,xb,d,s':['堂甥男','从父甥男','堂外甥','堂甥'], - 'f,xb,d,s,w':['堂甥妇','从父甥妇'], + 'f,xb,d,s':['堂外甥','堂甥男','从父甥男','堂甥'], + 'f,xb,d,s,w':['堂甥媳妇','堂甥妇','从父甥妇'], 'f,xb,d,s,s':['堂甥孙男','从父甥孙男','堂甥孙','从父甥孙'], 'f,xb,d,s,s,w':['堂甥孙妇','从父甥孙妇'], 'f,xb,d,s,d':['堂甥孙女','从父甥孙女','堂甥孙','从父甥孙'], 'f,xb,d,s,d,h':['堂甥孙婿','从父甥孙婿'], - 'f,xb,d,d':['堂甥女','从父甥女','堂外甥女','堂甥'], - 'f,xb,d,d,h':['堂甥婿','从父甥婿'], + 'f,xb,d,d':['堂外甥女','堂甥女','从父甥女','堂甥'], + 'f,xb,d,d,h':['堂甥女婿','堂甥婿','从父甥婿'], 'f,xb,d,d,s':['堂甥外孙男','从父甥外孙男','堂甥外孙','从父甥外孙'], 'f,xb,d,d,s,w':['堂甥外孙妇','从父甥外孙妇'], 'f,xb,d,d,d':['堂甥外孙女','从父甥外孙女','堂甥外孙','从父甥外孙'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index d317508..87b5b94 100644 --- a/dist/relationship.min.js +++ b/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=[],d=!0;f.length;){var m=f.shift(),b=[],w=!1;for(var l in h){var o=h[l];o.indexOf(m)>-1&&(!l&&f.length||b.push(l),w=!0)}if(w||(d=!1),x.length){for(var e=[],l=0;l-1&&(s=","+f+s),s.match(/,[w0],w|,[h1],h/))return!1;var m=function(s){var f="";if(!d[s]){d[s]=!0;var b=!0;do{f=s;for(var h in w){var l=w[h];if(s=s.replace(l.exp,l.str),s.indexOf("#")>-1){for(var o=s.split("#"),e=0;e-1?d="&l":s.indexOf("&l")>-1&&(d="&o"),s){s=s.replace(/&[ol]/g,""),f=f?1:0;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=[],l=0;l-1?l.sex:h.sex;for(var e=f(l.selector,o),r=0;r-1&&(!l&&f.length||b.push(l),w=!0)}if(w||(d=!1),x.length){for(var e=[],l=0;l-1&&(s=","+f+s),s.match(/,[w0],w|,[h1],h/))return!1;var m=function(s){var f="";if(!d[s]){d[s]=!0;var b=!0;do{f=s;for(var h in w){var l=w[h];if(s=s.replace(l.exp,l.str),s.indexOf("#")>-1){for(var o=s.split("#"),e=0;e-1?d="&l":s.indexOf("&l")>-1&&(d="&o"),s){s=s.replace(/&[ol]/g,""),f=f?1:0;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=[],l=0;l-1?l.sex:h.sex;for(var e=f(l.selector,o),r=0;r