59764fa · typeable/pandoc

git.iko.soy/typeable/pandoc

Parsing: uri, email: resolve entities.

A markdown link `<http://göogle.com>` should be a link to http://göogle.com.

commit59764fa3884e63ee9711cc2d0da2ef3133c641ba authorJohn MacFarlane <fiddlosopher@gmail.com> dateFri 15 Feb 2013, 22:39 (14 years ago) parent5491adb

1 file changed+3−2

unifiedsplit

src/Text/Pandoc/Parsing.hs+3−2

@@ -149,6 +149,7 @@ where

149149import Text.Pandoc.Definition

150150import Text.Pandoc.Options

151151import Text.Pandoc.Builder (Blocks, Inlines, rawBlock)

152+import Text.Pandoc.XML (fromEntities)

152153import qualified Text.Pandoc.UTF8 as UTF8 (putStrLn)

153154import Text.Parsec

154155import Text.Parsec.Pos (newPos)

@@ -369,7 +370,7 @@ romanNumeral upperCase = do

369370-- escaped mailto: URI.

370371emailAddress :: Parser [Char] st (String, String)

371372emailAddress = try $ liftA2 toResult mailbox (char '@' *> domain)

372− where toResult mbox dom = let full = mbox ++ '@':dom

373+ where toResult mbox dom = let full = fromEntities $ mbox ++ '@':dom

373374 in (full, escapeURI $ "mailto:" ++ full)

374375 mailbox = intercalate "." `fmap` (emailWord `sepby1` dot)

375376 domain = intercalate "." `fmap` (subdomain `sepby1` dot)

@@ -440,7 +441,7 @@ uri = try $ do

440441 <|> enclosed (char '[') (char ']') uriChunk)

441442 <|> uriChunk))

442443 str' <- option str $ char '/' >> return (str ++ "/")

443− let uri' = scheme ++ ":" ++ str'

444+ let uri' = scheme ++ ":" ++ fromEntities str'

444445 return (uri', escapeURI uri')

445446

446447-- | Applies a parser, returns tuple of its results and its horizontal