From 11456ba5ce250854e4912bb50cddd113a07728a7 Mon Sep 17 00:00:00 2001
From: fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>
Date: Wed, 24 Jan 2007 20:55:27 +0000
Subject: Changed Markdown autoLink parsing to conform better to Markdown.pl's
 behavior.  <google.com> is not treated as a link, but <http://google.com>,
 <ftp://google.com>, and <mailto:google@google.com> are.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@513 788f1e2b-df1e-0410-8736-df70ead52e1b
---
 src/Text/Pandoc/Readers/Markdown.hs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs
index 5354574b9..3aa0a6f12 100644
--- a/src/Text/Pandoc/Readers/Markdown.hs
+++ b/src/Text/Pandoc/Readers/Markdown.hs
@@ -928,9 +928,7 @@ referenceLinkSingle = try (do
      else fail "no corresponding key"
   return (Link label (Ref label))) 
 
-autoLink = do
-  notFollowedBy' (anyHtmlTag <|> anyHtmlEndTag)
-  autoLinkEmail <|> autoLinkRegular
+autoLink = autoLinkEmail <|> autoLinkRegular
 
 -- a link <like@this.com>
 autoLinkEmail = try $ do
@@ -941,10 +939,12 @@ autoLinkEmail = try $ do
   char autoLinkEnd
   return $ Link [Str src] (Src ("mailto:" ++ src) "")
 
--- a link <like.this.com>
+-- a link <http://like.this.com>
 autoLinkRegular = try $ do
-  src <- between (char autoLinkStart) (char autoLinkEnd) 
-         (many (noneOf (spaceChars ++ endLineChars ++ [autoLinkEnd])))
+  char autoLinkStart
+  prot <- oneOfStrings ["http:", "ftp:", "mailto:"]
+  rest <- many1Till (noneOf " \t\n<>") (char autoLinkEnd)
+  let src = prot ++ rest
   return $ Link [Str src] (Src src "")
 
 image = try (do
-- 
cgit v1.2.3