on master help sign in
Fixed url inclusion bug. Brochure example works now.
6b4b806Jasper Van der Jeugt
src/Text/Hakyll/Internal/Page.hs+6−4
@@ -19,11 +19,12 @@ import Test.QuickCheck
19import Text.Pandoc
19import Text.Pandoc
20import Data.Binary
20import Data.Binary
21
21
22−import Text.Hakyll.Internal.Cache
23−import Text.Hakyll.Hakyll
24−import Text.Hakyll.Util (trim)
25import Text.Hakyll.Context (Context)
22import Text.Hakyll.Context (Context)
23+import Text.Hakyll.File
24+import Text.Hakyll.Hakyll
26import Text.Hakyll.Regex (substituteRegex, matchesRegex)
25import Text.Hakyll.Regex (substituteRegex, matchesRegex)
26+import Text.Hakyll.Util (trim)
27+import Text.Hakyll.Internal.Cache
27
28
28-- | A Page is basically key-value mapping. Certain keys have special
29-- | A Page is basically key-value mapping. Certain keys have special
29-- meanings, like for example url, body and title.
30-- meanings, like for example url, body and title.
@@ -121,9 +122,10 @@ readPageFromFile path = do
121
122
122 -- Read file.
123 -- Read file.
123 contents <- liftIO $ readFile path
124 contents <- liftIO $ readFile path
125+ url <- toUrl path
124 let sections = splitAtDelimiters $ lines contents
126 let sections = splitAtDelimiters $ lines contents
125 sectionsData = concat $ zipWith ($) sectionFunctions sections
127 sectionsData = concat $ zipWith ($) sectionFunctions sections
126− context = M.fromList $ category ++ sectionsData
128+ context = M.fromList $ ("url", url) : category ++ sectionsData
127
129
128 return context
130 return context
129 where
131 where