b4f264d · hakyll · git.iko.soy

git.iko.soy/hakyll

Merge pull request #284 from rickynils/pandoc-citeproc-0.4

Fix compilation errors with pandoc-citeproc 0.4

commitb4f264d70e6afac61d6ba6ffb1d6c36120e5b862 authorJasper Van der Jeugt <jaspervdj@gmail.com> dateMon 25 Aug 2014, 10:33 (12 years ago) parent1288a64 2b10812

2 files changed+5−5

compare with master

unifiedsplit

hakyll.cabal+4−4 src/Hakyll/Web/Pandoc/Biblio.hs+1−1

hakyll.cabal+4−4

@@ -157,8 +157,8 @@ Library

157157 network >= 2.4 && < 2.6,

158158 old-locale >= 1.0 && < 1.1,

159159 old-time >= 1.0 && < 1.2,

160− pandoc >= 1.12.4 && < 1.13,

161− pandoc-citeproc >= 0.1 && < 0.4,

160+ pandoc >= 1.12.4 && < 1.14,

161+ pandoc-citeproc >= 0.4 && < 0.5,

162162 parsec >= 3.0 && < 3.2,

163163 process >= 1.0 && < 1.3,

164164 random >= 1.0 && < 1.1,

@@ -243,8 +243,8 @@ Test-suite hakyll-tests

243243 network >= 2.4 && < 2.6,

244244 old-locale >= 1.0 && < 1.1,

245245 old-time >= 1.0 && < 1.2,

246− pandoc >= 1.12.4 && < 1.13,

247− pandoc-citeproc >= 0.1 && < 0.4,

246+ pandoc >= 1.12.4 && < 1.14,

247+ pandoc-citeproc >= 0.4 && < 0.5,

248248 parsec >= 3.0 && < 3.2,

249249 process >= 1.0 && < 1.3,

250250 random >= 1.0 && < 1.1,

src/Hakyll/Web/Pandoc/Biblio.hs+1−1

@@ -90,7 +90,7 @@ readPandocBiblio :: ReaderOptions

9090 -> Compiler (Item Pandoc)

9191readPandocBiblio ropt csl biblio item = do

9292 -- Parse CSL file, if given

93− style <- unsafeCompiler $ CSL.readCSLFile . toFilePath . itemIdentifier $ csl

93+ style <- unsafeCompiler $ CSL.readCSLFile Nothing . toFilePath . itemIdentifier $ csl

9494

9595 -- We need to know the citation keys, add then *before* actually parsing the

9696 -- actual page. If we don't do this, pandoc won't even consider them