diff options
Diffstat (limited to 'Text/Pandoc/Readers')
| -rw-r--r-- | Text/Pandoc/Readers/Markdown.hs | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/Text/Pandoc/Readers/Markdown.hs b/Text/Pandoc/Readers/Markdown.hs index 2c0bf8db8..365218b3d 100644 --- a/Text/Pandoc/Readers/Markdown.hs +++ b/Text/Pandoc/Readers/Markdown.hs @@ -235,9 +235,9 @@ block = choice [ header , hrule , list , blockQuote - , htmlBlock , rawLaTeXEnvironment' , para + , htmlBlock , plain , nullBlock ] <?> "block" @@ -448,8 +448,16 @@ definitionList = do -- paragraph block -- +isHtmlOrBlank (HtmlInline _) = True +isHtmlOrBlank (Space) = True +isHtmlOrBlank (LineBreak) = True +isHtmlOrBlank _ = False + para = try $ do result <- many1 inline + if all isHtmlOrBlank result + then fail "treat as raw HTML" + else return () newline blanklines <|> do st <- getState if stateStrict st @@ -886,8 +894,8 @@ rawLaTeXInline' = failIfStrict >> rawLaTeXInline rawHtmlInline' = do st <- getState - result <- choice $ if stateStrict st - then [htmlBlockElement, anyHtmlTag, anyHtmlEndTag] - else [htmlBlockElement, anyHtmlInlineTag] + result <- if stateStrict st + then choice [htmlBlockElement, anyHtmlTag, anyHtmlEndTag] + else anyHtmlInlineTag return $ HtmlInline result |