Permalink
Browse files

Changed --toc-level to --toc-depth.

  • Loading branch information...
John MacFarlane
John MacFarlane committed Jan 5, 2013
1 parent 2e08945 commit c45ae571ccee3cd0e6aa11b3b43e8eaf6315386b
Showing with 13 additions and 13 deletions.
  1. +1 −1 README
  2. +1 −1 data/templates
  3. +6 −6 pandoc.hs
  4. +2 −2 src/Text/Pandoc/Options.hs
  5. +1 −1 src/Text/Pandoc/Writers/EPUB.hs
  6. +1 −1 src/Text/Pandoc/Writers/LaTeX.hs
  7. +1 −1 src/Text/Pandoc/Writers/RST.hs
View
2 README
@@ -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`.
Submodule templates updated 2 files
+1 −1 default.latex
+1 −1 default.rst
View
@@ -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
}
@@ -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
}
@@ -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
@@ -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))
@@ -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

0 comments on commit c45ae57

Please sign in to comment.