1b8c22d · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

Muse reader: get rid of HTML parser dependency

1b8c22dAlexander Krotov8 years ago

src/Text/Pandoc/Readers/Muse.hs+13−5

compare with master

unifiedsplit

@@ -59,7 +59,6 @@ import Text.Pandoc.Definition

59import Text.Pandoc.Logging

60import Text.Pandoc.Options

61import Text.Pandoc.Parsing hiding (F, enclosed)

62−import Text.Pandoc.Readers.HTML (htmlTag)

63import Text.Pandoc.Shared (crFilter, underlineSpan)

62import Text.Pandoc.Shared (crFilter, underlineSpan)

65-- | Read Muse from an input string and return a Pandoc document.

64-- | Read Muse from an input string and return a Pandoc document.

@@ -180,12 +179,21 @@ someUntil p end = first <$> ((:) <$> p) <*> manyUntil p end

180-- ** HTML parsers

179-- ** HTML parsers

181

180

182openTag :: PandocMonad m => String -> MuseParser m [(String, String)]

181openTag :: PandocMonad m => String -> MuseParser m [(String, String)]

183−openTag tag = do

182+openTag tag = try $ do

184− (TagOpen _ attr, _) <- htmlTag(~== TagOpen tag [])

183+ char '<'

185− return $ attr

184+ string tag

185+ attrs <- manyTill attr (char '>')

186+ return attrs

187+ where

188+ attr = try $ do

189+ many1 spaceChar

190+ key <- many1 (noneOf "=\n")

191+ string "=\""

192+ value <- manyTill (noneOf "\"") (char '"')

193+ return (key, value)

186

194

187closeTag :: PandocMonad m => String -> MuseParser m ()

195closeTag :: PandocMonad m => String -> MuseParser m ()

188−closeTag tag = void $ htmlTag (~== TagClose tag)

196+closeTag tag = try $ string "</" >> string tag >> void (char '>')

189

197

190-- | Parse HTML tag, returning its attributes and literal contents.

198-- | Parse HTML tag, returning its attributes and literal contents.

191htmlElement :: PandocMonad m

199htmlElement :: PandocMonad m