cb62cd0 · typeable/pandoc

src/Text/Pandoc/Readers/Markdown.hs+1−1

compare with master

unifiedsplit

@@ -948,7 +948,7 @@ rawVerbatimBlock = try $ do

948 ["pre", "style", "script"])

949 (const True))

950 contents <- manyTill anyChar (htmlTag (~== TagClose tag))

951− return $ open ++ contents ++ renderTags [TagClose tag]

951+ return $ open ++ contents ++ renderTags' [TagClose tag]

952

953rawTeXBlock :: MarkdownParser (F Blocks)

954rawTeXBlock = do

src/Text/Pandoc/Writers/EPUB.hs+2−2

@@ -784,7 +784,7 @@ transformBlock opts mediaRef (RawBlock fmt raw)

784 | fmt == Format "html" = do

785 let tags = parseTags raw

786 tags' <- mapM (transformTag opts mediaRef) tags

787− return $ RawBlock fmt (renderTags tags')

787+ return $ RawBlock fmt (renderTags' tags')

788transformBlock _ _ b = return b

789

790transformInline :: WriterOptions

@@ -804,7 +804,7 @@ transformInline opts mediaRef (RawInline fmt raw)

804 | fmt == Format "html" = do

805 let tags = parseTags raw

806 tags' <- mapM (transformTag opts mediaRef) tags

807− return $ RawInline fmt (renderTags tags')

807+ return $ RawInline fmt (renderTags' tags')

808transformInline _ _ x = return x

809

810writeHtmlInline :: WriterOptions -> Inline -> String

src/Text/Pandoc/Writers/Markdown.hs+2−2

@@ -46,7 +46,7 @@ import Control.Monad.State

46import qualified Data.Set as Set

47import Text.Pandoc.Writers.HTML (writeHtmlString)

48import Text.Pandoc.Readers.TeXMath (readTeXMath')

49−import Text.HTML.TagSoup (renderTags, parseTags, isTagText, Tag(..))

49+import Text.HTML.TagSoup (parseTags, isTagText, Tag(..))

50import Network.URI (isURI)

51import Data.Default

52import Data.Yaml (Value(Object,String,Array,Bool,Number))

@@ -471,7 +471,7 @@ addMarkdownAttribute :: String -> String

471addMarkdownAttribute s =

472 case span isTagText $ reverse $ parseTags s of

473 (xs,(TagOpen t attrs:rest)) ->

474− renderTags $ reverse rest ++ (TagOpen t attrs' : reverse xs)

474+ renderTags' $ reverse rest ++ (TagOpen t attrs' : reverse xs)

475 where attrs' = ("markdown","1"):[(x,y) | (x,y) <- attrs,

476 x /= "markdown"]

477 _ -> s