yogsototh/hakyll
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Fix compilation errors with pandoc-citeproc 0.4
This commit is contained in:
Jasper Van der Jeugt 2014-08-25 10:33:20 +02:00
commit b4f264d70e
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
hakyll.cabal
View file

@ -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,

2
src/Hakyll/Web/Pandoc/Biblio.hs
View file

@ -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