887977c · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

Muse reader: remove `nested`

887977cAlexander Krotov9 years ago

src/Text/Pandoc/Readers/Muse.hs+2−11

compare with master

unifiedsplit

@@ -55,7 +55,7 @@ import Text.Pandoc.Class (PandocMonad (..))

55import Text.Pandoc.Definition

56import Text.Pandoc.Logging

57import Text.Pandoc.Options

58−import Text.Pandoc.Parsing hiding (nested)

58+import Text.Pandoc.Parsing

59import Text.Pandoc.Readers.HTML (htmlTag)

60import Text.Pandoc.Shared (crFilter)

61import Text.Pandoc.XML (fromEntities)

@@ -102,15 +102,6 @@ parseBlocks = do

102eol :: Stream s m Char => ParserT s st m ()

103eol = void newline <|> eof

104

105−nested :: PandocMonad m => MuseParser m a -> MuseParser m a

106−nested p = do

107− nestlevel <- stateMaxNestingLevel <$> getState

108− guard $ nestlevel > 0

109− updateState $ \st -> st{ stateMaxNestingLevel = stateMaxNestingLevel st - 1 }

110− res <- p

111− updateState $ \st -> st{ stateMaxNestingLevel = nestlevel }

112− return res

113−

114htmlElement :: PandocMonad m => String -> MuseParser m (Attr, String)

105htmlElement :: PandocMonad m => String -> MuseParser m (Attr, String)

115htmlElement tag = try $ do

106htmlElement tag = try $ do

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

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

@@ -133,7 +124,7 @@ parseHtmlContentWithAttrs tag parser = do

133 parsedContent <- parseContent (content ++ "\n")

124 parsedContent <- parseContent (content ++ "\n")

134 return (attr, parsedContent)

125 return (attr, parsedContent)

135 where

126 where

136− parseContent = parseFromString $ nested $ manyTill parser endOfContent

127+ parseContent = parseFromString $ manyTill parser endOfContent

137 endOfContent = try $ skipMany blankline >> skipSpaces >> eof

128 endOfContent = try $ skipMany blankline >> skipSpaces >> eof

138

129

139parseHtmlContent :: PandocMonad m => String -> MuseParser m a -> MuseParser m [a]

130parseHtmlContent :: PandocMonad m => String -> MuseParser m a -> MuseParser m [a]