From edf646a90de4dcb420a7b7426d266335e2f7c67f Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Fri, 30 Dec 2011 11:42:05 -0800 Subject: ConTeXt writer: Made `--toc` work even without `--number-sections`. --- src/Text/Pandoc/Writers/ConTeXt.hs | 4 ++-- templates | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Text/Pandoc/Writers/ConTeXt.hs b/src/Text/Pandoc/Writers/ConTeXt.hs index ad27daffe..58cba268f 100644 --- a/src/Text/Pandoc/Writers/ConTeXt.hs +++ b/src/Text/Pandoc/Writers/ConTeXt.hs @@ -76,6 +76,7 @@ pandocToConTeXt options (Pandoc (Meta title authors date) blocks) = do , ("body", main) , ("title", titletext) , ("date", datetext) ] ++ + [ ("number-sections", "yes") | writerNumberSections options ] ++ [ ("author", a) | a <- authorstext ] return $ if writerStandalone options then renderTemplate context $ writerTemplate options @@ -175,11 +176,10 @@ blockToConTeXt (Header level lst) = do contents <- inlineListToConTeXt lst st <- get let opts = stOptions st - let base = if writerNumberSections opts then "section" else "subject" let level' = if writerChapters opts then level - 1 else level return $ if level' >= 1 && level' <= 5 then char '\\' <> text (concat (replicate (level' - 1) "sub")) <> - text base <> char '{' <> contents <> char '}' <> blankline + text "section" <> char '{' <> contents <> char '}' <> blankline else if level' == 0 then "\\chapter{" <> contents <> "}" else contents <> blankline diff --git a/templates b/templates index 88ec02606..5dcdf3738 160000 --- a/templates +++ b/templates @@ -1 +1 @@ -Subproject commit 88ec0260641e994069fa1b2c1912306c515420f8 +Subproject commit 5dcdf3738f0469143bb61ec9b89e9b34a21e2194 -- cgit v1.2.3