From 26418b7d14ce04a7386392388d2a3cbded205705 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sat, 23 Jul 2011 12:04:31 -0700
Subject: [PATCH] HTML writer/templates: Made TOC more customizable.
The container for the TOC is now in the template, so users
can insert a header or other styling. Thanks to Bruce D'Arcus
for the suggestion.
---
src/Text/Pandoc/Writers/HTML.hs | 13 ++++---------
templates | 2 +-
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/src/Text/Pandoc/Writers/HTML.hs b/src/Text/Pandoc/Writers/HTML.hs
index ae94f7696..4c82f2c85 100644
--- a/src/Text/Pandoc/Writers/HTML.hs
+++ b/src/Text/Pandoc/Writers/HTML.hs
@@ -169,7 +169,9 @@ inTemplate opts tit auths date toc body' newvars =
[ ("body", dropWhile (=='\n') $ showHtmlFragment body')
, ("pagetitle", topTitle')
, ("title", dropWhile (=='\n') $ showHtmlFragment tit)
- , ("date", date') ] ++
+ , ("date", date')
+ , ("idprefix", writerIdentifierPrefix opts)
+ ] ++
[ ("html5","true") | writerHtml5 opts ] ++
(case toc of
Just t -> [ ("toc", showHtmlFragment t)]
@@ -198,14 +200,7 @@ tableOfContents opts sects = do
let tocList = catMaybes contents
return $ if null tocList
then Nothing
- else Just $
- if writerHtml5 opts
- then (tag "nav" ! [prefixedId opts' "TOC"] $
- nl opts +++ unordList opts tocList +++ nl opts)
- +++ nl opts
- else (thediv ! [prefixedId opts' "TOC"] $
- nl opts +++ unordList opts tocList +++ nl opts)
- +++ nl opts
+ else Just $ unordList opts tocList
-- | Convert section number to string
showSecNum :: [Int] -> String
diff --git a/templates b/templates
index 8590fab13..8cb5fef74 160000
--- a/templates
+++ b/templates
@@ -1 +1 @@
-Subproject commit 8590fab1359fd618a7f8f737121c9413a8749d1a
+Subproject commit 8cb5fef740725ee51ffed5022faa097f21336bcd