summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorJasper Van der Jeugt <jaspervdj@gmail.com>2011-02-12 15:21:26 +0100
committerJasper Van der Jeugt <jaspervdj@gmail.com>2011-02-12 15:21:26 +0100
commitf910233e0ff0e276a10a1a8f37cf4c02499ef9ae (patch)
tree2ceee8d702cd249c486d0ede426804fbb0a6c04c /examples
parent645ac84b636f1a7725f032c2eeff68214aacda64 (diff)
downloadhakyll-f910233e0ff0e276a10a1a8f37cf4c02499ef9ae.tar.gz
Avoid name clashes with pandoc
Diffstat (limited to 'examples')
-rw-r--r--examples/hakyll/hakyll.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/hakyll/hakyll.hs b/examples/hakyll/hakyll.hs
index 92f24c7..35f0ba4 100644
--- a/examples/hakyll/hakyll.hs
+++ b/examples/hakyll/hakyll.hs
@@ -2,7 +2,7 @@
import Hakyll
import Control.Monad (forM_)
import Control.Arrow ((>>>), arr)
-import Text.Pandoc (writerTableOfContents, writerTemplate, writerStandalone)
+import Text.Pandoc
main :: IO ()
main = hakyll $ do
@@ -25,7 +25,7 @@ main = hakyll $ do
-- Tutorial
route "tutorial.markdown" $ setExtension "html"
compile "tutorial.markdown" $ pageRead
- >>> pageRenderPandocWith defaultParserState withToc
+ >>> pageRenderPandocWith defaultHakyllParserState withToc
>>> requireA "sidebar.markdown" (setFieldA "sidebar" $ arr pageBody)
>>> defaultApplyTemplate "templates/default.html"
>>> defaultRelativizeUrls
@@ -36,7 +36,7 @@ main = hakyll $ do
-- Templates
compile "templates/*" defaultTemplateRead
where
- withToc = defaultWriterOptions
+ withToc = defaultHakyllWriterOptions
{ writerTableOfContents = True
, writerTemplate = "<h2>Table of contents</h2>\n$toc$\n$body$"
, writerStandalone = True