a243afb · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

Markdown reader: Fixed small bug in HTML parsing with markdown_attribute.

a243afbJohn MacFarlane12 years ago

src/Text/Pandoc/Readers/Markdown.hs+4−3

@@ -1404,8 +1404,7 @@ escapedChar = do

1404ltSign :: MarkdownParser (F Inlines)

1405ltSign = do

1406 guardDisabled Ext_raw_html

1407− <|> guardDisabled Ext_markdown_in_html_blocks

1408− <|> (notFollowedBy' (htmlTag isBlockTag) >> return ())

1407+ <|> (notFollowedByHtmlCloser >> notFollowedBy' (htmlTag isBlockTag))

1409 char '<'

1408 char '<'

1410 return $ return $ B.str "<"

1409 return $ return $ B.str "<"

1411

1410

@@ -1797,7 +1796,9 @@ rawHtmlInline = do

1797 Just t' -> t ~== TagClose t'

1796 Just t' -> t ~== TagClose t'

1798 Nothing -> False

1797 Nothing -> False

1799 mdInHtml <- option False $

1798 mdInHtml <- option False $

1800− guardEnabled Ext_markdown_in_html_blocks >> return True

1799+ ( guardEnabled Ext_markdown_in_html_blocks

1800+ <|> guardEnabled Ext_markdown_attribute

1801+ ) >> return True

1801 (_,result) <- htmlTag $ if mdInHtml

1802 (_,result) <- htmlTag $ if mdInHtml

1802 then (\x -> isInlineTag x &&

1803 then (\x -> isInlineTag x &&

1803 not (isCloseBlockTag x))

1804 not (isCloseBlockTag x))