From a6ef781ef4fd21957a2c07312961b9c5115ee928 Mon Sep 17 00:00:00 2001 From: PASSER-BY Date: Thu, 25 Nov 2021 00:15:33 +0800 Subject: [PATCH] =?UTF-8?q?updated=20=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/relationship.min.js | 2 +- script/relationship.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dist/relationship.min.js b/dist/relationship.min.js index 6e96f54..1b2ddfc 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,m={"哥":"兄","姐":"姊","媳妇":"妇","女婿":"婿","媳":"妇","夫":"婿","姪":"侄","姊妹姻":"姻","女姻":"姻","兄弟眷":"眷","男眷":"眷"};f.length;){var b=f.shift(),w=[];for(var h in o){var l=o[h];if(l.indexOf(b)>-1)w.push(h);else{var e=b;for(var r in m)e=e.replace(r,m[r]);var t=l.map(function(s){for(var f in m)s=s.replace(f,m[f]);return s});t.indexOf(e)>-1&&w.push(h)}}w.length||(d=!1);var n=[];x.forEach(function(s){w.forEach(function(f){n.push(s+","+f)})}),x=n}return d?x:[]}function f(s,f){var x=[],d={};if(f<0&&(f=s.match(/^,w/)?1:0),f=f?1:0,s.indexOf(",1")==-1&&s.indexOf(",0")==-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 o=w[h];if(s=s.replace(o.exp,o.str),s.indexOf("#")>-1){for(var l=s.split("#"),e=0;e-1)w.push(h);else{var e=b;for(var r in m)e=e.replace(r,m[r]);var t=l.map(function(s){for(var f in m)s=s.replace(f,m[f]);return s});t.indexOf(e)>-1&&w.push(h)}}w.length||(d=!1);var n=[];x.forEach(function(s){w.forEach(function(f){n.push(s+","+f)})}),x=n}return d?x:[]}function f(s,f){var x=[],d={};if(f<0&&(f=s.match(/^,w/)?1:0),f=f?1:0,s.indexOf(",1")==-1&&s.indexOf(",0")==-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 o=w[h];if(s=s.replace(o.exp,o.str),s.indexOf("#")>-1){for(var l=s.split("#"),e=0;e-1?h.sex:r.sex;var o=f(h.selector,t);o&&o.forEach(function(s){if("chain"==r.type){r.reverse&&(s=d(s,t));var f=m(s);f&&i.push(f)}else{r.reverse&&(s=d(s,t));var b=x(t+","+s);b.length||(b=x(s)),b.length||0!=s.indexOf("w")&&0!=s.indexOf("h")||(b=x(s.substr(2))),b.length&&(i=i.concat(b))}})})}),e(i)};r.dataCount=0;for(var t in o)r.dataCount++;return r.setMode=function(s,f){"undefined"==typeof l[s]&&(l[s]={}),l[s]=Object.assign(l[s],f)},r}); \ No newline at end of file diff --git a/script/relationship.js b/script/relationship.js index f7e8f58..1b5f3c8 100644 --- a/script/relationship.js +++ b/script/relationship.js @@ -712,8 +712,8 @@ // 从父 'f,ob':['伯父','伯伯','阿伯','大伯','大爹','大爸','x伯'], 'f,ob,w':['伯母','伯妈','伯娘','大娘','大妈','x妈'], - 'f,lb':['叔叔','叔父','叔爸','叔爹','阿叔','仲父','小叔','小爹','小爸','幺爸','x叔','叔'], - 'f,lb,w':['婶婶','婶母','婶娘','婶爹','阿婶','婶妈','小婶','小婶娘','婶子','婶儿','家婶','叔母','叔妈','叔娘','季母','小娘','小妈','幺婶','x婶','婶'], + 'f,lb':['叔叔','叔父','叔爸','叔爹','阿叔','仲父','小叔','小爹','小爸','幺爸','叔','x叔'], + 'f,lb,w':['婶婶','婶母','婶娘','婶爹','阿婶','婶妈','小婶','小婶娘','婶子','婶儿','家婶','叔母','叔妈','叔娘','季母','小娘','小妈','幺婶','婶','x婶'], 'f,xb,w,f':['叔眷外祖父','叔眷王父','叔眷毑父','叔眷姥爷','眷姥爷'], 'f,xb,w,m':['叔眷外祖女','叔眷王母','叔眷毑母','叔眷姥姥','眷姥姥'], 'f,xb,w,xb':['叔眷舅父','眷舅父'], @@ -799,7 +799,7 @@ // 姑表 'f,os':['姑母','大姑妈'], 'f,ls':['姑姐','小姑妈','姑仔'], - 'f,xs':['姑妈','姑姑','姑娘','姑','x姑妈'], + 'f,xs':['姑妈','姑姑','姑娘','姑','x姑妈','x姑'], 'f,xs,h':['姑丈','姑父','姑爸','姑夫','x姑丈','x姑父'], 'f,xs,h,f':['姑姻祖父','姑姻王父','姑姻爷爷','姻爷爷'], 'f,xs,h,m':['姑姻祖母','姑姻王父','姑姻奶奶','姻奶奶'],