@@ -17,9 +17,16 @@ import Text.Hakyll.HakyllAction
17import Text.Hakyll.Regex (substituteRegex, matchesRegex)
17import Text.Hakyll.Regex (substituteRegex, matchesRegex)
18import Text.Hakyll.Util (trim)
18import Text.Hakyll.Util (trim)
20−-- | Page info handle: (key, value, needs rendering)
20+-- | A page is first parsed into a number of page sections. A page section
27+-- * A 'Bool' flag, indicating if the value is applicable for rendering
22−data PageSection = PageSection {unPageSection :: [(String, String, Bool)]}
29+data PageSection = PageSection {unPageSection :: (String, String, Bool)}
23 deriving (Show)
30 deriving (Show)
25-- | Split a page into sections.
32-- | Split a page into sections.
@@ -48,26 +55,26 @@ isPossibleDelimiter = isPrefixOf "---"
49readSection :: Bool -- ^ If this section is the first section in the page.
56readSection :: Bool -- ^ If this section is the first section in the page.
50 -> [String] -- ^ Lines in the section.
57 -> [String] -- ^ Lines in the section.
51− -> PageSection -- ^ Key-values extracted.
58+ -> [PageSection] -- ^ Key-values extracted.
52−readSection _ [] = PageSection []
59+readSection _ [] = []
53readSection isFirst ls
60readSection isFirst ls
54− | not isDelimiter' = body ls
61+ | not isDelimiter' = [body ls]
55− | isNamedDelimiter = PageSection $ readSectionMetaData ls
62+ | isNamedDelimiter = readSectionMetaData ls
56− | isFirst = PageSection $ readSimpleMetaData (drop 1 ls)
63+ | isFirst = readSimpleMetaData (drop 1 ls)
57− | otherwise = body (drop 1 ls)
64+ | otherwise = [body (drop 1 ls)]
59 isDelimiter' = isPossibleDelimiter (head ls)
66 isDelimiter' = isPossibleDelimiter (head ls)
60 isNamedDelimiter = head ls `matchesRegex` "^----* *[a-zA-Z0-9][a-zA-Z0-9]*"
67 isNamedDelimiter = head ls `matchesRegex` "^----* *[a-zA-Z0-9][a-zA-Z0-9]*"
61− body ls' = PageSection [("body", unlines ls', True)]
68+ body ls' = PageSection ("body", unlines ls', True)
63 readSimpleMetaData = map readPair . filter (not . all isSpace)
70 readSimpleMetaData = map readPair . filter (not . all isSpace)
64 readPair = trimPair . break (== ':')
71 readPair = trimPair . break (== ':')
65− trimPair (key, value) = (trim key, trim (drop 1 value), False)
72+ trimPair (key, value) = PageSection (trim key, trim (drop 1 value), False)
67 readSectionMetaData [] = []
74 readSectionMetaData [] = []
68 readSectionMetaData (header:value) =
75 readSectionMetaData (header:value) =
69 let key = substituteRegex "[^a-zA-Z0-9]" "" header
76 let key = substituteRegex "[^a-zA-Z0-9]" "" header
70− in [(key, unlines value, True)]
77+ in [PageSection (key, unlines value, True)]
72-- | Read a page from a file. Metadata is supported.
79-- | Read a page from a file. Metadata is supported.
@@ -79,14 +86,14 @@ readPage path = do
79 contents <- liftIO $ readFile path
86 contents <- liftIO $ readFile path
80 url <- toUrl path
87 url <- toUrl path
81 let sections = evalState (splitAtDelimiters $ lines contents) Nothing
88 let sections = evalState (splitAtDelimiters $ lines contents) Nothing
82− sectionsData = zipWith ($) sectionFunctions sections
89+ sectionsData = concat $ zipWith ($) sectionFunctions sections
84− return $ PageSection [ ("url", url, False)
91+ return $ PageSection ("url", url, False)
85− , ("path", path, False)
92+ : PageSection ("path", path, False)
86− ] : category : sectionsData
93+ : (category ++ sectionsData)
88 category = let dirs = splitDirectories $ takeDirectory path
95 category = let dirs = splitDirectories $ takeDirectory path
89− in PageSection [("category", last dirs, False) | not (null dirs)]
96+ in [PageSection ("category", last dirs, False) | not (null dirs)]
91-- | Read a page from a file. Metadata is supported.
98-- | Read a page from a file. Metadata is supported.