diff options
| author | fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> | 2008-04-20 03:12:42 +0000 |
|---|---|---|
| committer | fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> | 2008-04-20 03:12:42 +0000 |
| commit | 6a46ffc0ad3d3ef5c4426d0e726f40dda1bfaf38 (patch) | |
| tree | 2face29f6ba9a63eb35e4b2707cde6317f73e7d9 /Text | |
| parent | 2fdcd1701ac25743316e81eb789e19c9cf622fa0 (diff) | |
Count anything that isn't a known block (HTML) tag as an inline tag
(rather than the other way around). Added "html", "head", and
"body" to list of block tags. Resolves Issue #66, allowing
<lj> to count as an inline tag.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1276 788f1e2b-df1e-0410-8736-df70ead52e1b
Diffstat (limited to 'Text')
| -rw-r--r-- | Text/Pandoc/Readers/HTML.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Text/Pandoc/Readers/HTML.hs b/Text/Pandoc/Readers/HTML.hs index 7bd76d983..8e3e6ee0a 100644 --- a/Text/Pandoc/Readers/HTML.hs +++ b/Text/Pandoc/Readers/HTML.hs @@ -69,9 +69,9 @@ inlineHtmlTags = ["a", "abbr", "acronym", "b", "basefont", "bdo", "big", "small", "span", "strike", "strong", "sub", "sup", "textarea", "tt", "u", "var"] ++ eitherBlockOrInline -blockHtmlTags = ["address", "blockquote", "center", "dir", "div", +blockHtmlTags = ["address", "blockquote", "body", "center", "dir", "div", "dl", "fieldset", "form", "h1", "h2", "h3", "h4", - "h5", "h6", "hr", "isindex", "menu", "noframes", + "h5", "h6", "hr", "html", "isindex", "menu", "noframes", "noscript", "ol", "p", "pre", "table", "ul", "dd", "dt", "frameset", "li", "tbody", "td", "tfoot", "th", "thead", "tr", "script"] ++ eitherBlockOrInline @@ -257,11 +257,11 @@ isBlock tag = (extractTagType tag) `elem` blockHtmlTags anyHtmlBlockTag = try $ do tag <- anyHtmlTag <|> anyHtmlEndTag - if not (isInline tag) then return tag else fail "not a block tag" + if isBlock tag then return tag else fail "not a block tag" anyHtmlInlineTag = try $ do tag <- anyHtmlTag <|> anyHtmlEndTag - if isInline tag then return tag else fail "not an inline tag" + if not (isBlock tag) then return tag else fail "not an inline tag" -- | Parses material between script tags. -- Scripts must be treated differently, because they can contain '<>' etc. |