From f3c83030b9b0e186f283523af08ca886de33783c Mon Sep 17 00:00:00 2001
From: Jasper Van der Jeugt <jaspervdj@gmail.com>
Date: Thu, 14 Jan 2010 21:01:18 +0100
Subject: Parallel version bump.

Conflicts:

	src/Text/Hakyll/Page.hs
---
 src/Text/Hakyll/Page.hs            | 4 ++--
 src/Text/Hakyll/Render/Internal.hs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/Text/Hakyll/Page.hs b/src/Text/Hakyll/Page.hs
index 0b7776b..6788240 100644
--- a/src/Text/Hakyll/Page.hs
+++ b/src/Text/Hakyll/Page.hs
@@ -10,7 +10,7 @@ import qualified Data.Map as M
 import qualified Data.List as L
 import Data.Maybe (fromMaybe)
 
-import Control.Parallel.Strategies (rnf, ($|))
+import Control.Parallel.Strategies (rdeepseq, ($|))
 
 import System.FilePath (FilePath, takeExtension)
 import System.IO
@@ -123,7 +123,7 @@ readPage pagePath = do
             , ("path", pagePath)
             ] ++ metaData
 
-    seq (($|) id rnf rendered) $ hClose handle
+    seq (($|) id rdeepseq rendered) $ hClose handle
 
     -- Cache if needed
     if getFromCache then return () else cachePage page
diff --git a/src/Text/Hakyll/Render/Internal.hs b/src/Text/Hakyll/Render/Internal.hs
index 3b9bfbb..8679dfb 100644
--- a/src/Text/Hakyll/Render/Internal.hs
+++ b/src/Text/Hakyll/Render/Internal.hs
@@ -14,7 +14,7 @@ import Text.Hakyll.Context (Context, ContextManipulation)
 import Data.List (isPrefixOf, foldl')
 import Data.Char (isAlpha)
 import Data.Maybe (fromMaybe)
-import Control.Parallel.Strategies (rnf, ($|))
+import Control.Parallel.Strategies (rdeepseq, ($|))
 import Text.Hakyll.Renderable
 import Text.Hakyll.Page
 import Text.Hakyll.File
@@ -54,7 +54,7 @@ pureRenderWith manipulation template context =
     let contextIgnoringRoot = M.insert "root" "$root" (manipulation context)
         body = regularSubstitute template contextIgnoringRoot
     -- Force the body to be rendered.
-    in ($|) id rnf (M.insert "body" body context)
+    in ($|) id rdeepseq (M.insert "body" body context)
 
 -- | A pure renderAndConcat function.
 pureRenderAndConcatWith :: ContextManipulation
-- 
cgit v1.2.3


From 47fae0ed2a075d6e685963c1ce411fe28d1fcfd5 Mon Sep 17 00:00:00 2001
From: Sebastian Schwarz <seschwar@googlemail.com>
Date: Mon, 18 Jan 2010 17:51:28 +0100
Subject: Added support for other common Markdown file extensions.

---
 src/Text/Hakyll/File.hs | 11 ++++++++++-
 src/Text/Hakyll/Page.hs |  6 ++----
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/Text/Hakyll/File.hs b/src/Text/Hakyll/File.hs
index 0ed91d5..2378ae9 100644
--- a/src/Text/Hakyll/File.hs
+++ b/src/Text/Hakyll/File.hs
@@ -39,7 +39,16 @@ toCache path = "_cache" </> (removeLeadingSeparator path)
 
 -- | Get the url for a given page.
 toURL :: FilePath -> FilePath
-toURL path = if takeExtension path `elem` [".markdown", ".md", ".tex"]
+toURL path = if takeExtension path `elem` [ ".markdown"
+                                          , ".md"
+                                          , ".mdn"
+                                          , ".mdwn"
+                                          , ".mkd"
+                                          , ".mkdn"
+                                          , ".mkdwn"
+                                          , ".text"
+                                          , ".tex"
+                                          ]
                 then flip addExtension ".html" $ dropExtension path
                 else path
 
diff --git a/src/Text/Hakyll/Page.hs b/src/Text/Hakyll/Page.hs
index 6788240..d338542 100644
--- a/src/Text/Hakyll/Page.hs
+++ b/src/Text/Hakyll/Page.hs
@@ -60,10 +60,8 @@ renderFunction ".html" = id
 renderFunction ext = writeHtmlString writerOptions
                    . readFunction ext defaultParserState
   where
-    readFunction ".markdown" = readMarkdown
-    readFunction ".md"       = readMarkdown
-    readFunction ".tex"      = readLaTeX
-    readFunction _           = readMarkdown
+    readFunction ".tex" = readLaTeX
+    readFunction _      = readMarkdown
 
 -- | Read metadata header from a file handle.
 readMetaData :: Handle -> IO [(String, String)]
-- 
cgit v1.2.3


From e01531bd7593b871d8fb18c5ea509394eb8785ba Mon Sep 17 00:00:00 2001
From: Sebastian Schwarz <seschwar@googlemail.com>
Date: Mon, 18 Jan 2010 18:00:39 +0100
Subject: Added reStructuredText support.

Why not?  Quickly tested.  Seems to work fine.
---
 src/Text/Hakyll/File.hs | 1 +
 src/Text/Hakyll/Page.hs | 1 +
 2 files changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/Text/Hakyll/File.hs b/src/Text/Hakyll/File.hs
index 2378ae9..81c4170 100644
--- a/src/Text/Hakyll/File.hs
+++ b/src/Text/Hakyll/File.hs
@@ -46,6 +46,7 @@ toURL path = if takeExtension path `elem` [ ".markdown"
                                           , ".mkd"
                                           , ".mkdn"
                                           , ".mkdwn"
+                                          , ".rst"
                                           , ".text"
                                           , ".tex"
                                           ]
diff --git a/src/Text/Hakyll/Page.hs b/src/Text/Hakyll/Page.hs
index d338542..e807442 100644
--- a/src/Text/Hakyll/Page.hs
+++ b/src/Text/Hakyll/Page.hs
@@ -60,6 +60,7 @@ renderFunction ".html" = id
 renderFunction ext = writeHtmlString writerOptions
                    . readFunction ext defaultParserState
   where
+    readFunction ".rst" = readRST
     readFunction ".tex" = readLaTeX
     readFunction _      = readMarkdown
 
-- 
cgit v1.2.3