Skip to content

Commit

Permalink
Use renderTags' for all tag rendering.
Browse files Browse the repository at this point in the history
This properly handles tags that should be self-closing.
Previously `<hr/>` would appear in EPUB output as `<hr></hr>`.
Closes #1420.
  • Loading branch information
jgm committed Jul 13, 2014
1 parent 3516d9d commit cb62cd0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/Text/Pandoc/Readers/Markdown.hs
Expand Up @@ -948,7 +948,7 @@ rawVerbatimBlock = try $ do
["pre", "style", "script"])
(const True))
contents <- manyTill anyChar (htmlTag (~== TagClose tag))
return $ open ++ contents ++ renderTags [TagClose tag]
return $ open ++ contents ++ renderTags' [TagClose tag]

rawTeXBlock :: MarkdownParser (F Blocks)
rawTeXBlock = do
Expand Down
4 changes: 2 additions & 2 deletions src/Text/Pandoc/Writers/EPUB.hs
Expand Up @@ -784,7 +784,7 @@ transformBlock opts mediaRef (RawBlock fmt raw)
| fmt == Format "html" = do
let tags = parseTags raw
tags' <- mapM (transformTag opts mediaRef) tags
return $ RawBlock fmt (renderTags tags')
return $ RawBlock fmt (renderTags' tags')
transformBlock _ _ b = return b

transformInline :: WriterOptions
Expand All @@ -804,7 +804,7 @@ transformInline opts mediaRef (RawInline fmt raw)
| fmt == Format "html" = do
let tags = parseTags raw
tags' <- mapM (transformTag opts mediaRef) tags
return $ RawInline fmt (renderTags tags')
return $ RawInline fmt (renderTags' tags')
transformInline _ _ x = return x

writeHtmlInline :: WriterOptions -> Inline -> String
Expand Down
4 changes: 2 additions & 2 deletions src/Text/Pandoc/Writers/Markdown.hs
Expand Up @@ -46,7 +46,7 @@ import Control.Monad.State
import qualified Data.Set as Set
import Text.Pandoc.Writers.HTML (writeHtmlString)
import Text.Pandoc.Readers.TeXMath (readTeXMath')
import Text.HTML.TagSoup (renderTags, parseTags, isTagText, Tag(..))
import Text.HTML.TagSoup (parseTags, isTagText, Tag(..))
import Network.URI (isURI)
import Data.Default
import Data.Yaml (Value(Object,String,Array,Bool,Number))
Expand Down Expand Up @@ -471,7 +471,7 @@ addMarkdownAttribute :: String -> String
addMarkdownAttribute s =
case span isTagText $ reverse $ parseTags s of
(xs,(TagOpen t attrs:rest)) ->
renderTags $ reverse rest ++ (TagOpen t attrs' : reverse xs)
renderTags' $ reverse rest ++ (TagOpen t attrs' : reverse xs)
where attrs' = ("markdown","1"):[(x,y) | (x,y) <- attrs,
x /= "markdown"]
_ -> s
Expand Down

0 comments on commit cb62cd0

Please sign in to comment.