From fdda8b88b066268f49578f185ba73bb8263b9e5a Mon Sep 17 00:00:00 2001
From: KenjiTakahashi <wozniakk@gmail.com>
Date: Wed, 24 Dec 2014 22:05:29 +0100
Subject: [PATCH 1/2] add tests for emphasis with links

---
 inline_test.go | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/inline_test.go b/inline_test.go
index 7ad3f0d..e95eb97 100644
--- a/inline_test.go
+++ b/inline_test.go
@@ -239,6 +239,23 @@ func TestEmphasisMix(t *testing.T) {
 	doTestsInline(t, tests)
 }
 
+func TestEmphasisLink(t *testing.T) {
+	var tests = []string{
+		"[first](before) *text[second] (inside)text* [third](after)\n",
+		"<p><a href=\"before\">first</a> <em>text<a href=\"inside\">second</a>text</em> <a href=\"after\">third</a></p>\n",
+
+		"*incomplete [link] definition*\n",
+		"<p><em>incomplete [link] definition</em></p>\n",
+
+		"*it's [emphasis*] (not link)\n",
+		"<p><em>it's [emphasis</em>] (not link)</p>\n",
+
+		"*it's [emphasis*] and *[asterisk]\n",
+		"<p><em>it's [emphasis</em>] and *[asterisk]</p>\n",
+	}
+	doTestsInline(t, tests)
+}
+
 func TestStrikeThrough(t *testing.T) {
 	var tests = []string{
 		"nothing inline\n",

From f147218833707a9fad0bafb54770e5419e612bc2 Mon Sep 17 00:00:00 2001
From: KenjiTakahashi <wozniakk@gmail.com>
Date: Mon, 29 Dec 2014 00:32:26 +0100
Subject: [PATCH 2/2] fix #19: return immediately from link skipping if end of
 emphasis is found

---
 inline.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inline.go b/inline.go
index 651e4e8..f76d7b3 100644
--- a/inline.go
+++ b/inline.go
@@ -948,7 +948,7 @@ func helperFindEmphChar(data []byte, c byte) int {
 			i++
 			for i < len(data) && data[i] != cc {
 				if tmpI == 0 && data[i] == c {
-					tmpI = i
+					return i
 				}
 				i++
 			}