diff options
| author | Jasper Van der Jeugt <jaspervdj@gmail.com> | 2014-08-25 10:33:20 +0200 |
|---|---|---|
| committer | Jasper Van der Jeugt <jaspervdj@gmail.com> | 2014-08-25 10:33:20 +0200 |
| commit | b4f264d70e6afac61d6ba6ffb1d6c36120e5b862 (patch) | |
| tree | ef515f7b66a0bf46200671ca31602d4dcb22abb0 | |
| parent | 1288a647815c6d8d5adafea9e56e66d9014eda18 (diff) | |
| parent | 2b108126bb60e0491c47ca5dd9d78103b40c13f8 (diff) | |
| download | hakyll-b4f264d70e6afac61d6ba6ffb1d6c36120e5b862.tar.gz | |
Merge pull request #284 from rickynils/pandoc-citeproc-0.4
Fix compilation errors with pandoc-citeproc 0.4
| -rw-r--r-- | hakyll.cabal | 8 | ||||
| -rw-r--r-- | src/Hakyll/Web/Pandoc/Biblio.hs | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/hakyll.cabal b/hakyll.cabal index 0f0398f..eb991fd 100644 --- a/hakyll.cabal +++ b/hakyll.cabal @@ -157,8 +157,8 @@ Library network >= 2.4 && < 2.6, old-locale >= 1.0 && < 1.1, old-time >= 1.0 && < 1.2, - pandoc >= 1.12.4 && < 1.13, - pandoc-citeproc >= 0.1 && < 0.4, + pandoc >= 1.12.4 && < 1.14, + pandoc-citeproc >= 0.4 && < 0.5, parsec >= 3.0 && < 3.2, process >= 1.0 && < 1.3, random >= 1.0 && < 1.1, @@ -243,8 +243,8 @@ Test-suite hakyll-tests network >= 2.4 && < 2.6, old-locale >= 1.0 && < 1.1, old-time >= 1.0 && < 1.2, - pandoc >= 1.12.4 && < 1.13, - pandoc-citeproc >= 0.1 && < 0.4, + pandoc >= 1.12.4 && < 1.14, + pandoc-citeproc >= 0.4 && < 0.5, parsec >= 3.0 && < 3.2, process >= 1.0 && < 1.3, random >= 1.0 && < 1.1, diff --git a/src/Hakyll/Web/Pandoc/Biblio.hs b/src/Hakyll/Web/Pandoc/Biblio.hs index db022bc..6c92f28 100644 --- a/src/Hakyll/Web/Pandoc/Biblio.hs +++ b/src/Hakyll/Web/Pandoc/Biblio.hs @@ -90,7 +90,7 @@ readPandocBiblio :: ReaderOptions -> Compiler (Item Pandoc) readPandocBiblio ropt csl biblio item = do -- Parse CSL file, if given - style <- unsafeCompiler $ CSL.readCSLFile . toFilePath . itemIdentifier $ csl + style <- unsafeCompiler $ CSL.readCSLFile Nothing . toFilePath . itemIdentifier $ csl -- We need to know the citation keys, add then *before* actually parsing the -- actual page. If we don't do this, pandoc won't even consider them |