git.iko.soy/hakyll
on master help sign in
Merge pull request #284 from rickynils/pandoc-citeproc-0.4
b4f264dJasper Van der Jeugt
hakyll.cabal+4−4
compare with master
unifiedsplit
@@ -157,8 +157,8 @@ Library
157 network >= 2.4 && < 2.6,
157 network >= 2.4 && < 2.6,
158 old-locale >= 1.0 && < 1.1,
158 old-locale >= 1.0 && < 1.1,
159 old-time >= 1.0 && < 1.2,
159 old-time >= 1.0 && < 1.2,
160− pandoc >= 1.12.4 && < 1.13,
160+ pandoc >= 1.12.4 && < 1.14,
161− pandoc-citeproc >= 0.1 && < 0.4,
161+ pandoc-citeproc >= 0.4 && < 0.5,
162 parsec >= 3.0 && < 3.2,
162 parsec >= 3.0 && < 3.2,
163 process >= 1.0 && < 1.3,
163 process >= 1.0 && < 1.3,
164 random >= 1.0 && < 1.1,
164 random >= 1.0 && < 1.1,
@@ -243,8 +243,8 @@ Test-suite hakyll-tests
243 network >= 2.4 && < 2.6,
243 network >= 2.4 && < 2.6,
244 old-locale >= 1.0 && < 1.1,
244 old-locale >= 1.0 && < 1.1,
245 old-time >= 1.0 && < 1.2,
245 old-time >= 1.0 && < 1.2,
246− pandoc >= 1.12.4 && < 1.13,
246+ pandoc >= 1.12.4 && < 1.14,
247− pandoc-citeproc >= 0.1 && < 0.4,
247+ pandoc-citeproc >= 0.4 && < 0.5,
248 parsec >= 3.0 && < 3.2,
248 parsec >= 3.0 && < 3.2,
249 process >= 1.0 && < 1.3,
249 process >= 1.0 && < 1.3,
250 random >= 1.0 && < 1.1,
250 random >= 1.0 && < 1.1,
src/Hakyll/Web/Pandoc/Biblio.hs+1−1
@@ -90,7 +90,7 @@ readPandocBiblio :: ReaderOptions
90 -> Compiler (Item Pandoc)
90 -> Compiler (Item Pandoc)
91readPandocBiblio ropt csl biblio item = do
91readPandocBiblio ropt csl biblio item = do
92 -- Parse CSL file, if given
92 -- Parse CSL file, if given
93− style <- unsafeCompiler $ CSL.readCSLFile . toFilePath . itemIdentifier $ csl
93+ style <- unsafeCompiler $ CSL.readCSLFile Nothing . toFilePath . itemIdentifier $ csl
94
94
95 -- We need to know the citation keys, add then *before* actually parsing the
95 -- We need to know the citation keys, add then *before* actually parsing the
96 -- actual page. If we don't do this, pandoc won't even consider them
96 -- actual page. If we don't do this, pandoc won't even consider them