diff options
author | John MacFarlane <jgm@berkeley.edu> | 2019-12-07 14:20:41 -0800 |
---|---|---|
committer | John MacFarlane <jgm@berkeley.edu> | 2019-12-07 14:20:41 -0800 |
commit | 0b54d6282bb89a71433043857f4983668f9a4beb (patch) | |
tree | 7088fcba2e14b6afdd5a1451b0a2108f9fa1ee41 | |
parent | 5295607de712fd5247e3e8ade21930c0a22c21dc (diff) | |
download | pandoc-0b54d6282bb89a71433043857f4983668f9a4beb.tar.gz |
Fix --toc-depth regression in 2.8.
Closes #5967.
-rw-r--r-- | src/Text/Pandoc/Writers/Shared.hs | 6 | ||||
-rw-r--r-- | test/command/5967.md | 15 |
2 files changed, 18 insertions, 3 deletions
diff --git a/src/Text/Pandoc/Writers/Shared.hs b/src/Text/Pandoc/Writers/Shared.hs index 0161db506..6018b4294 100644 --- a/src/Text/Pandoc/Writers/Shared.hs +++ b/src/Text/Pandoc/Writers/Shared.hs @@ -407,9 +407,9 @@ toTableOfContents opts bs = sectionToListItem :: WriterOptions -> Block -> [Block] sectionToListItem opts (Div (ident,_,_) (Header lev (_,classes,kvs) ils : subsecs)) - | not (isNothing (lookup "number" kvs) && "unlisted" `elem` classes) - = Plain headerLink : [BulletList listContents | not (null listContents) - , lev < writerTOCDepth opts] + | lev <= writerTOCDepth opts + , not (isNothing (lookup "number" kvs) && "unlisted" `elem` classes) + = Plain headerLink : [BulletList listContents | not (null listContents)] where num = fromMaybe "" $ lookup "number" kvs addNumber = if T.null num diff --git a/test/command/5967.md b/test/command/5967.md new file mode 100644 index 000000000..9bb802d40 --- /dev/null +++ b/test/command/5967.md @@ -0,0 +1,15 @@ +``` +% pandoc --toc --toc-depth=3 -s -t plain +# One +## Two +#### Four +^D +- One + - Two + +One + +Two + +Four +``` |