cadcf62 · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

Muse reader: move para definition into blockElements

cadcf62Alexander Krotov9 years ago

src/Text/Pandoc/Readers/Muse.hs+1−4

@@ -267,6 +267,7 @@ parseBlock = do

267 res <- blockElements <|> para

268 trace (take 60 $ show $ B.toList $ runF res def)

269 return res

270+ where para = fst <$> paraUntil (try (eof <|> void (lookAhead blockElements)))

270

271

271blockElements :: PandocMonad m => MuseParser m (F Blocks)

272blockElements :: PandocMonad m => MuseParser m (F Blocks)

272blockElements = choice [ mempty <$ blankline

273blockElements = choice [ mempty <$ blankline

@@ -414,10 +415,6 @@ paraUntil end = do

414 let p = fmap (f . B.para) $ trimInlinesF $ mconcat l

415 let p = fmap (f . B.para) $ trimInlinesF $ mconcat l

415 return (p, e)

416 return (p, e)

416

417

417−para :: PandocMonad m => MuseParser m (F Blocks)

418−para =

419− fst <$> paraUntil (try (eof <|> void (lookAhead blockElements)))

420−

421noteMarker :: PandocMonad m => MuseParser m String

418noteMarker :: PandocMonad m => MuseParser m String

422noteMarker = try $ do

419noteMarker = try $ do

423 char '['

420 char '['