aboutsummaryrefslogtreecommitdiff
path: root/src/Text
diff options
context:
space:
mode:
authorAlexander Krotov <ilabdsf@gmail.com>2018-09-19 14:05:55 +0300
committerAlexander Krotov <ilabdsf@gmail.com>2018-09-19 14:05:55 +0300
commit94b9561e056f44eea891f394bde6547bf05dcb1b (patch)
treeaf27be65490dd9a34812a7d4bb890f57d8ce3304 /src/Text
parent1feb62cb24a8fda5ce8ea823ec102abc0bd6e2ec (diff)
downloadpandoc-94b9561e056f44eea891f394bde6547bf05dcb1b.tar.gz
Muse reader: make openTag return association list
Diffstat (limited to 'src/Text')
-rw-r--r--src/Text/Pandoc/Readers/Muse.hs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Text/Pandoc/Readers/Muse.hs b/src/Text/Pandoc/Readers/Muse.hs
index ea45ea9fc..4c6d78d1b 100644
--- a/src/Text/Pandoc/Readers/Muse.hs
+++ b/src/Text/Pandoc/Readers/Muse.hs
@@ -179,10 +179,10 @@ someUntil p end = first <$> ((:) <$> p) <*> manyUntil p end
-- ** HTML parsers
-openTag :: PandocMonad m => String -> MuseParser m Attr
+openTag :: PandocMonad m => String -> MuseParser m [(String, String)]
openTag tag = do
(TagOpen _ attr, _) <- htmlTag(~== TagOpen tag [])
- return $ htmlAttrToPandoc attr
+ return $ attr
closeTag :: PandocMonad m => String -> MuseParser m ()
closeTag tag = void $ htmlTag (~== TagClose tag)
@@ -194,7 +194,7 @@ htmlElement :: PandocMonad m
htmlElement tag = try $ do
attr <- openTag tag
content <- manyTill anyChar $ closeTag tag
- return (attr, content)
+ return (htmlAttrToPandoc attr, content)
htmlBlock :: PandocMonad m
=> String -- ^ Tag name
@@ -223,7 +223,7 @@ parseHtmlContent tag = try $ do
manyTill spaceChar eol
content <- parseBlocksTill $ try $ count (sourceColumn pos - 1) spaceChar >> closeTag tag
manyTill spaceChar eol -- closing tag must be followed by optional whitespace and newline
- return (attr, content)
+ return (htmlAttrToPandoc attr, content)
-- ** Directive parsers
@@ -427,7 +427,7 @@ exampleTag = try $ do
literalTag :: PandocMonad m => MuseParser m (F Blocks)
literalTag = try $ do
many spaceChar
- attr <- openTag "literal"
+ attr <- htmlAttrToPandoc <$> openTag "literal"
manyTill spaceChar eol
content <- manyTill anyChar $ closeTag "literal"
manyTill spaceChar eol