@@ -79,7 +79,7 @@ type MuseParser = ParserT String ParserState
7979parseMuse :: PandocMonad m => MuseParser m Pandoc
8080parseMuse = do
8181 many directive
82− blocks <- mconcat <$> many block
82+ blocks <- mconcat <$> many parseBlock
8383 eof
8484 st <- getState
8585 let doc = runF (do Pandoc _ bs <- B.doc <$> blocks
@@ -187,9 +187,6 @@ parseBlock = do
187187 trace (take 60 $ show $ B.toList $ runF res defaultParserState)
188188 return res
189189
190−block :: PandocMonad m => MuseParser m (F Blocks)
191−block = parseBlock <* skipMany blankline
192−
193190blockElements :: PandocMonad m => MuseParser m (F Blocks)
194191blockElements = choice [ mempty <$ blankline
195192 , comment
@@ -287,7 +284,7 @@ blockTag :: PandocMonad m
287284 -> String
288285 -> MuseParser m (F Blocks)
289286blockTag f s = do
290− res <- parseHtmlContent s block
287+ res <- parseHtmlContent s parseBlock
291288 return $ f <$> mconcat res
292289
293290-- <center> tag is ignored
@@ -304,7 +301,7 @@ quoteTag = withQuoteContext InDoubleQuote $ blockTag B.blockQuote "quote"
304301-- <div> tag is supported by Emacs Muse, but not Amusewiki 2.025
305302divTag :: PandocMonad m => MuseParser m (F Blocks)
306303divTag = do
307− (attrs, content) <- parseHtmlContentWithAttrs "div" block
304+ (attrs, content) <- parseHtmlContentWithAttrs "div" parseBlock
308305 return $ B.divWith attrs <$> mconcat content
309306
310307verseLine :: PandocMonad m => MuseParser m String
@@ -377,7 +374,7 @@ emacsNoteBlock = try $ do
377374 return mempty
378375 where
379376 blocksTillNote =
380− many1Till block (eof <|> () <$ lookAhead noteMarker)
377+ many1Till parseBlock (eof <|> () <$ lookAhead noteMarker)
381378
382379--
383380-- Verse markup