@@ -47,7 +47,7 @@ import Text.Pandoc.Class (PandocMonad)
4747import Text.Pandoc.Definition
4848import Text.Pandoc.Options
4949import Text.Pandoc.Shared (isTightList, taskListItemToAscii, linesToPara,
50− substitute, capitalize)
50+ substitute, capitalize, isHeaderBlock)
5151import Text.Pandoc.Templates (renderTemplate')
5252import Text.Pandoc.Walk (query, walk, walkM)
5353import Text.Pandoc.Writers.HTML (writeHtml5String, tagWithAttributes)
@@ -57,6 +57,12 @@ import Text.Pandoc.XML (toHtml5Entities)
5757-- | Convert Pandoc to CommonMark.
5858writeCommonMark :: PandocMonad m => WriterOptions -> Pandoc -> m Text
5959writeCommonMark opts (Pandoc meta blocks) = do
60+ let headerBlocks = filter isHeaderBlock blocks
61+ toc <- if writerTableOfContents opts
62+ then blocksToCommonMark opts
63+ [ toTableOfContents opts headerBlocks ]
64+ else return mempty
65+
6066 let (blocks', notes) = runState (walkM processNotes blocks) []
6167 notes' = if null notes
6268 then []
@@ -66,7 +72,12 @@ writeCommonMark opts (Pandoc meta blocks) = do
6672 (blocksToCommonMark opts)
6773 (inlinesToCommonMark opts)
6874 meta
69− let context = defField "body" main metadata
75+ let context =
76+ -- for backwards compatibility we populate toc
77+ -- with the contents of the toc, rather than a boolean:
78+ defField "toc" toc
79+ $ defField "table-of-contents" toc
80+ $ defField "body" main metadata
7081 case writerTemplate opts of
7182 Nothing -> return main
7283 Just tpl -> renderTemplate' tpl context