df9dba3 · hakyll · git.iko.soy

on master help sign in

Merge pull request #339 from kadoban/docbook

df9dba3Jasper Van der Jeugt12 years ago

src/Hakyll/Web/Pandoc.hs+1

@@ -49,6 +49,7 @@ readPandocWith :: ReaderOptions -- ^ Parser options

49readPandocWith ropt item = fmap (reader ropt (itemFileType item)) item

50 where

51 reader ro t = case t of

52+ DocBook -> readDocBook ro

52 Html -> readHtml ro

53 Html -> readHtml ro

53 LaTeX -> readLaTeX ro

54 LaTeX -> readLaTeX ro

54 LiterateHaskell t' -> reader (addExt ro Ext_literate_haskell) t'

55 LiterateHaskell t' -> reader (addExt ro Ext_literate_haskell) t'

src/Hakyll/Web/Pandoc/FileType.hs+2

@@ -22,6 +22,7 @@ import Hakyll.Core.Item

22data FileType

23 = Binary

24 | Css

25+ | DocBook

25 | Html

26 | Html

26 | LaTeX

27 | LaTeX

27 | LiterateHaskell FileType

28 | LiterateHaskell FileType

@@ -39,6 +40,7 @@ fileType :: FilePath -> FileType

39fileType = uncurry fileType' . splitExtension

40fileType = uncurry fileType' . splitExtension

40 where

41 where

41 fileType' _ ".css" = Css

42 fileType' _ ".css" = Css

43+ fileType' _ ".dbk" = DocBook

42 fileType' _ ".htm" = Html

44 fileType' _ ".htm" = Html

43 fileType' _ ".html" = Html

45 fileType' _ ".html" = Html

44 fileType' f ".lhs" = LiterateHaskell $ case fileType f of

46 fileType' f ".lhs" = LiterateHaskell $ case fileType f of