649608d · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

Markdown: allow ---- in angle-bracket autolinks.

649608dJohn MacFarlane14 years ago

src/Text/Pandoc/Readers/Markdown.hs+7−2

@@ -41,6 +41,7 @@ import qualified Text.Pandoc.Builder as B

41import Text.Pandoc.Builder (Inlines, Blocks, trimInlines, (<>))

42import Text.Pandoc.Options

43import Text.Pandoc.Shared

44+import Text.Pandoc.XML (fromEntities)

44import Text.Pandoc.Parsing hiding (tableWith)

45import Text.Pandoc.Parsing hiding (tableWith)

45import Text.Pandoc.Readers.LaTeX ( rawLaTeXInline, rawLaTeXBlock )

46import Text.Pandoc.Readers.LaTeX ( rawLaTeXInline, rawLaTeXBlock )

46import Text.Pandoc.Readers.HTML ( htmlTag, htmlInBalanced, isInlineTag, isBlockTag,

47import Text.Pandoc.Readers.HTML ( htmlTag, htmlInBalanced, isInlineTag, isBlockTag,

@@ -1565,8 +1566,12 @@ autoLink :: MarkdownParser (F Inlines)

1565autoLink = try $ do

1566autoLink = try $ do

1566 char '<'

1567 char '<'

1567 (orig, src) <- uri <|> emailAddress

1568 (orig, src) <- uri <|> emailAddress

1568− char '>'

1569+ -- in rare cases, something may remain after the uri parser

1570+ -- is finished, because the uri parser tries to avoid parsing

1571+ -- final punctuation. for example: in `<http://hi---there>`,

1572+ -- the URI parser will stop before the dashes.

1573+ extra <- fromEntities <$> manyTill nonspaceChar (char '>')

1569− return $ return $ B.link src "" (B.str orig)

1574+ return $ return $ B.link (src ++ escapeURI extra) "" (B.str $ orig ++ extra)

1570

1575

1571image :: MarkdownParser (F Inlines)

1576image :: MarkdownParser (F Inlines)

1572image = try $ do

1577image = try $ do