diff options
author | Jasper Van der Jeugt <jaspervdj@gmail.com> | 2010-01-18 19:30:43 +0100 |
---|---|---|
committer | Jasper Van der Jeugt <jaspervdj@gmail.com> | 2010-01-18 19:30:43 +0100 |
commit | 06408148eef18707c32cad4d06e293c65962fe5c (patch) | |
tree | 9852933ccb577e00f28cd681486c44561bc93eec /src/Text/Hakyll/Page.hs | |
parent | 673ed68b8fd41c9420d353e6efd11d5405e53360 (diff) | |
parent | e01531bd7593b871d8fb18c5ea509394eb8785ba (diff) | |
download | hakyll-06408148eef18707c32cad4d06e293c65962fe5c.tar.gz |
Merge branch 'master' of git://github.com/seschwar/Hakyll into experimental
Conflicts:
hakyll.cabal
src/Text/Hakyll/Page.hs
src/Text/Hakyll/Render/Internal.hs
Diffstat (limited to 'src/Text/Hakyll/Page.hs')
-rw-r--r-- | src/Text/Hakyll/Page.hs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/Text/Hakyll/Page.hs b/src/Text/Hakyll/Page.hs index bd15ad1..bae7fa6 100644 --- a/src/Text/Hakyll/Page.hs +++ b/src/Text/Hakyll/Page.hs @@ -61,10 +61,9 @@ renderFunction ".html" = id renderFunction ext = writeHtmlString writerOptions . readFunction ext defaultParserState where - readFunction ".markdown" = readMarkdown - readFunction ".md" = readMarkdown - readFunction ".tex" = readLaTeX - readFunction _ = readMarkdown + readFunction ".rst" = readRST + readFunction ".tex" = readLaTeX + readFunction _ = readMarkdown -- | Read metadata header from a file handle. readMetaData :: Handle -> Hakyll [(String, String)] @@ -134,7 +133,7 @@ readPage pagePath = do , ("path", pagePath) ] ++ metaData - seq (($|) id rdeepseq rendered) $ liftIO $ hClose handle + seq (($|) id rdeepseq rendered) $ hClose handle -- Cache if needed if getFromCache then return () else cachePage page |