Merge pull request #833 from mojavelinux/issue-819

resolves #819 match URL macro following entity

2 files changed, 6 insertions, 1 deletions

diff --git a/lib/asciidoctor.rb b/lib/asciidoctor.rb
index 073e3760..d2046372 100755
--- a/lib/asciidoctor.rb
+++ b/lib/asciidoctor.rb
@@ -557,7 +557,7 @@ module Asciidoctor
 
     # inline link and some inline link macro
     # FIXME revisit!
-    :link_inline      => %r{(^|link:|\s|>|&lt;|[\(\)\[\]])(\\?(?:https?|ftp|irc)://[^\s\[\]<]*[^\s.,\[\]<])(?:\[((?:\\\]|[^\]])*?)\])?},
+    :link_inline      => %r{(^|link:|&lt;|[\s>\(\)\[\];])(\\?(?:https?|ftp|irc)://[^\s\[\]<]*[^\s.,\[\]<])(?:\[((?:\\\]|[^\]])*?)\])?},
 
     # inline link macro
     # link:path[label]
diff --git a/test/links_test.rb b/test/links_test.rb
index 39f08024..4a47aef9 100644
--- a/test/links_test.rb
+++ b/test/links_test.rb
@@ -50,6 +50,11 @@ context 'Links' do
     assert_xpath '//a[@href="http://asciidoc.org"][text()="AsciiDoc"]', render_string(')http://asciidoc.org[AsciiDoc] project page.'), 1
   end
 
+  test 'qualified url following smart apostrophe' do
+    output = render_embedded_string("l&#8217;http://www.irit.fr[IRIT]") 
+    assert_match(/l&#8217;<a href=/, output)
+  end
+
   test 'qualified url using invalid link macro should not create link' do
     assert_xpath '//a', render_string('link:http://asciidoc.org is the project page for AsciiDoc.'), 0
   end