Fix compilation issues

chungyc · Feb 26, 2020 · d143a4d · d143a4d
1 parent 178c1df
commit d143a4d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/lib/Hakyll/Main.hs b/lib/Hakyll/Main.hs
@@ -4,7 +4,7 @@
 
 module Hakyll.Main
     ( -- * Entry points
-    , hakyll
+      hakyll
     , hakyllWith
     , hakyllWithArgs
     , hakyllWithExitCode

diff --git a/web/site.hs b/web/site.hs
@@ -3,12 +3,11 @@
 import           Control.Arrow    (second)
 import           Control.Monad    (filterM, forM_)
 import           Data.List        (isPrefixOf, sortBy)
-import           Data.Monoid      ((<>))
 import           Data.Ord         (comparing)
 import           Hakyll
 import           System.Directory (copyFile)
 import           System.FilePath  (dropTrailingPathSeparator, splitPath)
-import           Text.Pandoc
+import qualified Text.Pandoc      as Pandoc
 
 
 --------------------------------------------------------------------------------
@@ -67,10 +66,16 @@ main = hakyllWith config $ do
     match "templates/*" $ compile templateCompiler
   where
     withToc = defaultHakyllWriterOptions
-        { writerTableOfContents = True
-        , writerTemplate        = Just "$toc$\n$body$"
+        { Pandoc.writerTableOfContents = True
+        , Pandoc.writerTemplate        = Just tocTemplate
         }
 
+    -- When did it get so hard to compile a string to a Pandoc template?
+    tocTemplate =
+        either error id $ either (error . show) id $
+        Pandoc.runPure $ Pandoc.runWithDefaultPartials $
+        Pandoc.compileTemplate "" "$toc$\n$body$"
+
 
 --------------------------------------------------------------------------------
 config :: Configuration