From dc431745730aaac244a2e59b25f5554a654abf4c Mon Sep 17 00:00:00 2001 From: leungbk Date: Sun, 27 Jan 2019 04:52:00 +0100 Subject: Org reader: separate filtering logic from conversion function. --- src/Text/Pandoc/Readers/Org/Blocks.hs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/Text/Pandoc/Readers/Org/Blocks.hs') diff --git a/src/Text/Pandoc/Readers/Org/Blocks.hs b/src/Text/Pandoc/Readers/Org/Blocks.hs index 9e3fe3d79..d6930398c 100644 --- a/src/Text/Pandoc/Readers/Org/Blocks.hs +++ b/src/Text/Pandoc/Readers/Org/Blocks.hs @@ -34,7 +34,7 @@ module Text.Pandoc.Readers.Org.Blocks import Prelude import Text.Pandoc.Readers.Org.BlockStarts -import Text.Pandoc.Readers.Org.DocumentTree (documentTree, headlineToBlocks) +import Text.Pandoc.Readers.Org.DocumentTree (documentTree, headlineToBlocks, filterHeadlineTree) import Text.Pandoc.Readers.Org.Inlines import Text.Pandoc.Readers.Org.Meta (metaExport, metaKey, metaLine) import Text.Pandoc.Readers.Org.ParserState @@ -64,9 +64,10 @@ import qualified Text.Pandoc.Walk as Walk -- | Get a list of blocks. blockList :: PandocMonad m => OrgParser m [Block] blockList = do - headlines <- documentTree blocks inline + fHeadlineTree <- documentTree blocks inline st <- getState - headlineBlocks <- headlineToBlocks $ runF headlines st + let headlineTree = runF fHeadlineTree st + headlineBlocks <- headlineToBlocks $ filterHeadlineTree headlineTree st -- ignore first headline, it's the document's title return . drop 1 . B.toList $ headlineBlocks -- cgit v1.2.3