da31280 · hakyll · git.iko.soy

examples/brochure/about.markdown+1−1

compare with master

unifiedsplit

@@ -5,7 +5,7 @@ Nullam imperdiet sodales orci vitae molestie. Nunc quam orci, pharetra a

5rhoncus vitae, eleifend id felis. Suspendisse potenti. Etiam vitae urna orci.

6Quisque pellentesque dignissim felis, egestas tempus urna luctus vitae. In hac

7habitasse platea dictumst. Morbi fringilla mattis odio, et mattis tellus

8−accumsan vitae.

8+accumsan vitae. 碁

9

10Vivamus eget mauris sit amet nulla laoreet lobortis. Nulla in diam elementum

11risus convallis commodo. Cras vehicula varius dui vitae facilisis. Proin

hakyll.cabal+1−2

@@ -34,8 +34,7 @@ library

34 mtl >= 1.1,

35 old-locale >= 1,

36 time >= 1,

37− parallel >= 2,

37+ parallel >= 2

38− utf8-string >= 0.3

39 exposed-modules: Text.Hakyll

38 exposed-modules: Text.Hakyll

40 Text.Hakyll.Hakyll

39 Text.Hakyll.Hakyll

41 Text.Hakyll.Render

40 Text.Hakyll.Render

src/Text/Hakyll/Page.hs+9−10

@@ -12,8 +12,7 @@ import Data.Maybe (fromMaybe)

12import Control.Parallel.Strategies (rdeepseq, ($|))

13import Control.Monad.Reader (liftIO)

14import System.FilePath (takeExtension)

15−import System.IO (IOMode(..), openFile, hClose)

15+import System.IO

16−import qualified System.IO.UTF8 as U

17

16

18import Text.Pandoc

17import Text.Pandoc

19

18

@@ -93,18 +92,18 @@ cachePage page@(Page mapping) = do

93

92

94 writePageToCache = do

93 writePageToCache = do

95 handle <- openFile destination WriteMode

94 handle <- openFile destination WriteMode

96− U.hPutStrLn handle "---"

95+ hPutStrLn handle "---"

97 mapM_ (writePair handle) $ M.toList simpleMetaData

96 mapM_ (writePair handle) $ M.toList simpleMetaData

98 mapM_ (writeSection handle) $ M.toList sectionMetaData

97 mapM_ (writeSection handle) $ M.toList sectionMetaData

99− U.hPutStrLn handle "---"

98+ hPutStrLn handle "---"

100− U.hPutStrLn handle $ getBody page

99+ hPutStrLn handle $ getBody page

101 hClose handle

100 hClose handle

102

101

103− writePair h (k, v) = do U.hPutStr h $ k ++ ": " ++ v

102+ writePair h (k, v) = do hPutStr h $ k ++ ": " ++ v

104− U.hPutStrLn h ""

103+ hPutStrLn h ""

105

104

106− writeSection h (k, v) = do U.hPutStrLn h $ "--- " ++ k

105+ writeSection h (k, v) = do hPutStrLn h $ "--- " ++ k

107− U.hPutStrLn h v

106+ hPutStrLn h v

108

107

109 destination = toCache $ getURL page

108 destination = toCache $ getURL page

110

109

@@ -147,7 +146,7 @@ readPage pagePath = do

147 -- Read file.

146 -- Read file.

148 handle <- liftIO $ openFile path ReadMode

147 handle <- liftIO $ openFile path ReadMode

149 sections <- fmap (splitAtDelimiters . lines )

148 sections <- fmap (splitAtDelimiters . lines )

150− (liftIO $ U.hGetContents handle)

149+ (liftIO $ hGetContents handle)

151

150

152 let context = concat $ zipWith ($) sectionFunctions sections

151 let context = concat $ zipWith ($) sectionFunctions sections

153 page = fromContext $ M.fromList $

152 page = fromContext $ M.fromList $

src/Text/Hakyll/Render/Internal.hs+1−2

@@ -16,7 +16,6 @@ import Data.List (isPrefixOf, foldl')

16import Data.Char (isAlpha)

17import Data.Maybe (fromMaybe)

18import Control.Parallel.Strategies (rdeepseq, ($|))

19−import qualified System.IO.UTF8 as U

20

19

21import Text.Hakyll.Renderable

20import Text.Hakyll.Renderable

22import Text.Hakyll.Page

21import Text.Hakyll.Page

@@ -90,6 +89,6 @@ writePage page = do

90 context = additionalContext' `M.union` (M.singleton "root" $ toRoot url)

89 context = additionalContext' `M.union` (M.singleton "root" $ toRoot url)

91 makeDirectories destination

90 makeDirectories destination

92 -- Substitute $root here, just before writing.

91 -- Substitute $root here, just before writing.

93− liftIO $ U.writeFile destination $ finalSubstitute (getBody page) context

92+ liftIO $ writeFile destination $ finalSubstitute (getBody page) context

94 where

93 where

95 url = getURL page

94 url = getURL page