@@ -179,10 +179,10 @@ someUntil p end = first <$> ((:) <$> p) <*> manyUntil p end
180-- ** HTML parsers
180-- ** HTML parsers
182−openTag :: PandocMonad m => String -> MuseParser m Attr
182+openTag :: PandocMonad m => String -> MuseParser m [(String, String)]
183openTag tag = do
183openTag tag = do
184 (TagOpen _ attr, _) <- htmlTag(~== TagOpen tag [])
184 (TagOpen _ attr, _) <- htmlTag(~== TagOpen tag [])
185− return $ htmlAttrToPandoc attr
185+ return $ attr
187closeTag :: PandocMonad m => String -> MuseParser m ()
187closeTag :: PandocMonad m => String -> MuseParser m ()
188closeTag tag = void $ htmlTag (~== TagClose tag)
188closeTag tag = void $ htmlTag (~== TagClose tag)
@@ -194,7 +194,7 @@ htmlElement :: PandocMonad m
194htmlElement tag = try $ do
194htmlElement tag = try $ do
195 attr <- openTag tag
195 attr <- openTag tag
196 content <- manyTill anyChar $ closeTag tag
196 content <- manyTill anyChar $ closeTag tag
197− return (attr, content)
197+ return (htmlAttrToPandoc attr, content)
199htmlBlock :: PandocMonad m
199htmlBlock :: PandocMonad m
200 => String -- ^ Tag name
200 => String -- ^ Tag name
@@ -223,7 +223,7 @@ parseHtmlContent tag = try $ do
223 manyTill spaceChar eol
223 manyTill spaceChar eol
224 content <- parseBlocksTill $ try $ count (sourceColumn pos - 1) spaceChar >> closeTag tag
224 content <- parseBlocksTill $ try $ count (sourceColumn pos - 1) spaceChar >> closeTag tag
225 manyTill spaceChar eol -- closing tag must be followed by optional whitespace and newline
225 manyTill spaceChar eol -- closing tag must be followed by optional whitespace and newline
226− return (attr, content)
226+ return (htmlAttrToPandoc attr, content)
228-- ** Directive parsers
228-- ** Directive parsers
@@ -427,7 +427,7 @@ exampleTag = try $ do
427literalTag :: PandocMonad m => MuseParser m (F Blocks)
427literalTag :: PandocMonad m => MuseParser m (F Blocks)
428literalTag = try $ do
428literalTag = try $ do
429 many spaceChar
429 many spaceChar
430− attr <- openTag "literal"
430+ attr <- htmlAttrToPandoc <$> openTag "literal"
431 manyTill spaceChar eol
431 manyTill spaceChar eol
432 content <- manyTill anyChar $ closeTag "literal"
432 content <- manyTill anyChar $ closeTag "literal"
433 manyTill spaceChar eol
433 manyTill spaceChar eol