From b159cf0d6ecfad931dd1d2129289163260c0764a Mon Sep 17 00:00:00 2001
From: mumuy <zhenghaole1990@126.com>
Date: Mon, 25 Jul 2016 10:16:55 +0800
Subject: [PATCH] =?UTF-8?q?updated=20=E5=85=BC=E5=AE=B9=E2=80=9C=E8=A1=A8?=
 =?UTF-8?q?=E5=A7=90=E7=9A=84=E8=A1=A8=E5=93=A5=E2=80=9D=E5=92=8C=E2=80=9C?=
 =?UTF-8?q?=E5=A7=A8=E5=A6=88=E7=9A=84=E5=A5=B3=E5=84=BF=E7=9A=84=E8=A1=A8?=
 =?UTF-8?q?=E5=93=A5=E2=80=9D=E7=AD=89=E7=A1=AE=E5=AE=9A=E4=B8=8E=E4=B8=8D?=
 =?UTF-8?q?=E7=A1=AE=E5=AE=9A=E5=B9=B4=E9=BE=84=E7=9A=84=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 script/relationship.js | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/script/relationship.js b/script/relationship.js
index b8b7a93..3a1a6c6 100644
--- a/script/relationship.js
+++ b/script/relationship.js
@@ -6,14 +6,6 @@
 	//简写
 	var _filter = [
 		/* 表亲 */
-		{//表亲的关系
-			exp:/^(.+)&o([^#]+)&o/g,
-			str:'$1$2&o'
-		},
-		{//表亲的关系
-			exp:/^(.+)&l([^#]+)&l/g,
-			str:'$1$2&l'
-		},
 		{//表亲的关系
 			exp:/^(.+)&o([^#]+)&l/g,
 			str:'$1$2'
@@ -22,6 +14,10 @@
 			exp:/^(.+)&l([^#]+)&o/g,
 			str:'$1$2'
 		},
+		{//表亲的关系
+			exp:/(,[ds],(.+),[ds])&[ol]/g,
+			str:'$1'
+		},
 		/* 父母 */
 		{//母亲的丈夫是自己的父亲
 			exp:/m,h/g,
@@ -713,8 +709,9 @@
 	window.relationship = relationship;
 })(window);
 
-// console.log(relationship({text:'爸爸的儿子的儿子的爸爸'}));
+// console.log(relationship({text:'表姐的表哥'}));
 //老婆的老公
 //老公的老婆的儿子的爸爸的老婆的儿子的爸爸
 //我的三舅的儿子的爸爸的妹妹的儿子的叔叔的哥哥
 //老婆的外孙的姥姥
+//大姨的女儿的表哥