git.iko.soy/typeable/pandoc
on master help sign in
Muse reader: remove `block` function
763126dAlexander Krotov
src/Text/Pandoc/Readers/Muse.hs+4−7
compare with master
unifiedsplit
@@ -79,7 +79,7 @@ type MuseParser = ParserT String ParserState
79parseMuse :: PandocMonad m => MuseParser m Pandoc
79parseMuse :: PandocMonad m => MuseParser m Pandoc
80parseMuse = do
80parseMuse = do
81 many directive
81 many directive
82− blocks <- mconcat <$> many block
82+ blocks <- mconcat <$> many parseBlock
83 eof
83 eof
84 st <- getState
84 st <- getState
85 let doc = runF (do Pandoc _ bs <- B.doc <$> blocks
85 let doc = runF (do Pandoc _ bs <- B.doc <$> blocks
@@ -187,9 +187,6 @@ parseBlock = do
187 trace (take 60 $ show $ B.toList $ runF res defaultParserState)
187 trace (take 60 $ show $ B.toList $ runF res defaultParserState)
188 return res
188 return res
189
189
190−block :: PandocMonad m => MuseParser m (F Blocks)
191−block = parseBlock <* skipMany blankline
192−
193blockElements :: PandocMonad m => MuseParser m (F Blocks)
190blockElements :: PandocMonad m => MuseParser m (F Blocks)
194blockElements = choice [ mempty <$ blankline
191blockElements = choice [ mempty <$ blankline
195 , comment
192 , comment
@@ -287,7 +284,7 @@ blockTag :: PandocMonad m
287 -> String
284 -> String
288 -> MuseParser m (F Blocks)
285 -> MuseParser m (F Blocks)
289blockTag f s = do
286blockTag f s = do
290− res <- parseHtmlContent s block
287+ res <- parseHtmlContent s parseBlock
291 return $ f <$> mconcat res
288 return $ f <$> mconcat res
292
289
293-- <center> tag is ignored
290-- <center> tag is ignored
@@ -304,7 +301,7 @@ quoteTag = withQuoteContext InDoubleQuote $ blockTag B.blockQuote "quote"
304-- <div> tag is supported by Emacs Muse, but not Amusewiki 2.025
301-- <div> tag is supported by Emacs Muse, but not Amusewiki 2.025
305divTag :: PandocMonad m => MuseParser m (F Blocks)
302divTag :: PandocMonad m => MuseParser m (F Blocks)
306divTag = do
303divTag = do
307− (attrs, content) <- parseHtmlContentWithAttrs "div" block
304+ (attrs, content) <- parseHtmlContentWithAttrs "div" parseBlock
308 return $ B.divWith attrs <$> mconcat content
305 return $ B.divWith attrs <$> mconcat content
309
306
310verseLine :: PandocMonad m => MuseParser m String
307verseLine :: PandocMonad m => MuseParser m String
@@ -377,7 +374,7 @@ emacsNoteBlock = try $ do
377 return mempty
374 return mempty
378 where
375 where
379 blocksTillNote =
376 blocksTillNote =
380− many1Till block (eof <|> () <$ lookAhead noteMarker)
377+ many1Till parseBlock (eof <|> () <$ lookAhead noteMarker)
381
378
382--
379--
383-- Verse markup
380-- Verse markup