diff options
| author | John MacFarlane <fiddlosopher@gmail.com> | 2013-01-05 12:03:05 -0800 |
|---|---|---|
| committer | John MacFarlane <fiddlosopher@gmail.com> | 2013-01-05 12:03:05 -0800 |
| commit | c45ae571ccee3cd0e6aa11b3b43e8eaf6315386b (patch) | |
| tree | 2481a6fb9c98a08f715300b34f5bfab1a24a579f | |
| parent | 2e0894554ce591488b7e0aebfaecf1fd7dc83c10 (diff) | |
| download | pandoc-c45ae571ccee3cd0e6aa11b3b43e8eaf6315386b.tar.gz | |
Changed --toc-level to --toc-depth.
| -rw-r--r-- | README | 2 | ||||
| m--------- | data/templates | 10 | ||||
| -rw-r--r-- | pandoc.hs | 12 | ||||
| -rw-r--r-- | src/Text/Pandoc/Options.hs | 4 | ||||
| -rw-r--r-- | src/Text/Pandoc/Writers/EPUB.hs | 2 | ||||
| -rw-r--r-- | src/Text/Pandoc/Writers/LaTeX.hs | 2 | ||||
| -rw-r--r-- | src/Text/Pandoc/Writers/RST.hs | 2 |
7 files changed, 17 insertions, 17 deletions
@@ -296,7 +296,7 @@ General writer options one) in the output document. This option has no effect on `man`, `docbook`, `slidy`, `slideous`, or `s5` output. -`--toc-level=`*NUMBER* +`--toc-depth=`*NUMBER* : Specify the number of section levels to include in the table of contents. The default is 3 (which means that level 1, 2, and 3 headers will be listed in the contents). Implies `--toc`. diff --git a/data/templates b/data/templates -Subproject 9575f4f56f6c59776938dfcfce7e28405593729 +Subproject 25ad173f00bc7e07c72468deb1d955f707aeaea @@ -115,7 +115,7 @@ data Opt = Opt , optEpubMetadata :: String -- ^ EPUB metadata , optEpubFonts :: [FilePath] -- ^ EPUB fonts to embed , optEpubChapterLevel :: Int -- ^ Header level at which to split chapters - , optTOCLevel :: Int -- ^ Number of levels to include in TOC + , optTOCDepth :: Int -- ^ Number of levels to include in TOC , optDumpArgs :: Bool -- ^ Output command-line arguments , optIgnoreArgs :: Bool -- ^ Ignore command-line arguments , optReferenceLinks :: Bool -- ^ Use reference links in writing markdown, rst @@ -169,7 +169,7 @@ defaultOpts = Opt , optEpubMetadata = "" , optEpubFonts = [] , optEpubChapterLevel = 1 - , optTOCLevel = 3 + , optTOCDepth = 3 , optDumpArgs = False , optIgnoreArgs = False , optReferenceLinks = False @@ -340,12 +340,12 @@ options = (\opt -> return opt { optTableOfContents = True })) "" -- "Include table of contents" - , Option "" ["toc-level"] + , Option "" ["toc-depth"] (ReqArg (\arg opt -> do case safeRead arg of Just t | t >= 1 && t <= 6 -> - return opt { optTOCLevel = t, + return opt { optTOCDepth = t, optTableOfContents = True } _ -> err 57 $ "TOC level must be a number between 1 and 6") @@ -831,7 +831,7 @@ main = do , optEpubMetadata = epubMetadata , optEpubFonts = epubFonts , optEpubChapterLevel = epubChapterLevel - , optTOCLevel = epubTOCLevel + , optTOCDepth = epubTOCDepth , optDumpArgs = dumpArgs , optIgnoreArgs = ignoreArgs , optReferenceLinks = referenceLinks @@ -1022,7 +1022,7 @@ main = do writerEpubStylesheet = epubStylesheet, writerEpubFonts = epubFonts, writerEpubChapterLevel = epubChapterLevel, - writerTOCLevel = epubTOCLevel, + writerTOCDepth = epubTOCDepth, writerReferenceODT = referenceODT, writerReferenceDocx = referenceDocx } diff --git a/src/Text/Pandoc/Options.hs b/src/Text/Pandoc/Options.hs index e51d7d3f6..d0801da3f 100644 --- a/src/Text/Pandoc/Options.hs +++ b/src/Text/Pandoc/Options.hs @@ -238,7 +238,7 @@ data WriterOptions = WriterOptions , writerEpubStylesheet :: Maybe String -- ^ EPUB stylesheet specified at command line , writerEpubFonts :: [FilePath] -- ^ Paths to fonts to embed , writerEpubChapterLevel :: Int -- ^ Header level for chapters (separate files) - , writerTOCLevel :: Int -- ^ Number of levels to include in TOC + , writerTOCDepth :: Int -- ^ Number of levels to include in TOC , writerReferenceODT :: Maybe FilePath -- ^ Path to reference ODT if specified , writerReferenceDocx :: Maybe FilePath -- ^ Ptah to reference DOCX if specified } deriving Show @@ -278,7 +278,7 @@ instance Default WriterOptions where , writerEpubStylesheet = Nothing , writerEpubFonts = [] , writerEpubChapterLevel = 1 - , writerTOCLevel = 3 + , writerTOCDepth = 3 , writerReferenceODT = Nothing , writerReferenceDocx = Nothing } diff --git a/src/Text/Pandoc/Writers/EPUB.hs b/src/Text/Pandoc/Writers/EPUB.hs index 9e97effeb..fc4df02b7 100644 --- a/src/Text/Pandoc/Writers/EPUB.hs +++ b/src/Text/Pandoc/Writers/EPUB.hs @@ -229,7 +229,7 @@ writeEPUB version opts doc@(Pandoc meta _) = do -- toc.ncx let secs = hierarchicalize blocks'' - let tocLevel = writerTOCLevel opts + let tocLevel = writerTOCDepth opts let navPointNode :: (Int -> String -> String -> [Element] -> Element) -> Shared.Element -> State Int Element diff --git a/src/Text/Pandoc/Writers/LaTeX.hs b/src/Text/Pandoc/Writers/LaTeX.hs index f93c168b7..0d4e37589 100644 --- a/src/Text/Pandoc/Writers/LaTeX.hs +++ b/src/Text/Pandoc/Writers/LaTeX.hs @@ -131,7 +131,7 @@ pandocToLaTeX options (Pandoc (Meta title authors date) blocks) = do _ -> [] context = writerVariables options ++ [ ("toc", if writerTableOfContents options then "yes" else "") - , ("toc-level", show (writerTOCLevel options - + , ("toc-depth", show (writerTOCDepth options - if writerChapters options then 1 else 0)) diff --git a/src/Text/Pandoc/Writers/RST.hs b/src/Text/Pandoc/Writers/RST.hs index ac4165116..a415c2de4 100644 --- a/src/Text/Pandoc/Writers/RST.hs +++ b/src/Text/Pandoc/Writers/RST.hs @@ -81,7 +81,7 @@ pandocToRST (Pandoc (Meta tit auth dat) blocks) = do , ("title", render Nothing title) , ("date", render colwidth date) , ("toc", if writerTableOfContents opts then "yes" else "") - , ("toc-level", show (writerTOCLevel opts)) ] ++ + , ("toc-depth", show (writerTOCDepth opts)) ] ++ [ ("math", "yes") | hasMath ] ++ [ ("author", render colwidth a) | a <- authors ] if writerStandalone opts |