Fixed handling of email addresses in markdown and reStructuredText.

Consolidated uri and email address parsers.  (Resolves Issue #37.)
+ New emailAddress and uri parsers in Text.Pandoc.Shared.
  uri parser uses parseURI from Network.URI.  emailAddress
  parser properly handles email addresses with periods in them.
+ Removed uri and emailAddress parsers from Text.Pandoc.Readers.RST.
+ Removed uri and emailAddress parsers from Text.Pandoc.Readers.Markdown.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1149 788f1e2b-df1e-0410-8736-df70ead52e1b

1 files changed, 1 insertions, 15 deletions

diff --git a/Text/Pandoc/Readers/Markdown.hs b/Text/Pandoc/Readers/Markdown.hs
index 38129d4b7..9b927ccd7 100644
--- a/Text/Pandoc/Readers/Markdown.hs
+++ b/Text/Pandoc/Readers/Markdown.hs
@@ -35,7 +35,6 @@ import Data.List ( transpose, isPrefixOf, isSuffixOf, lookup, sortBy, findIndex
 import Data.Ord ( comparing )
 import Data.Char ( isAlphaNum )
 import Data.Maybe ( fromMaybe )
-import Network.URI ( isURI )
 import Text.Pandoc.Definition
 import Text.Pandoc.Shared 
 import Text.Pandoc.Readers.LaTeX ( rawLaTeXInline, rawLaTeXEnvironment )
@@ -850,22 +849,9 @@ referenceLink label = do
      Nothing     -> fail "no corresponding key" 
      Just target -> return target 
 
-emailAddress = try $ do
-  name <- many1 (alphaNum <|> char '+')
-  char '@'
-  first <- many1 alphaNum
-  rest <- many1 (char '.' >> many1 alphaNum)
-  return $ "mailto:" ++ name ++ "@" ++ joinWithSep "." (first:rest)
-
-uri = try $ do
-  str <- many1 (noneOf "\n\t >")
-  if isURI str
-     then return str
-     else fail "not a URI"
-
 autoLink = try $ do
   char '<'
-  src <- uri <|> emailAddress
+  src <- uri <|> (emailAddress >>= (return . ("mailto:" ++)))
   char '>'
   let src' = if "mailto:" `isPrefixOf` src
                 then drop 7 src