fe77089 · hakyll · git.iko.soy

git.iko.soy/hakyll

Made page parser a little less strict.

commitfe77089955dbf1002496e34824da13bfaf64a898 authorJasper Van der Jeugt <jaspervdj@gmail.com> dateTue 19 Jan 2010, 15:50 (17 years ago) parentf5a6c49

2 files changed+6−5

compare with master

unifiedsplit

src/Text/Hakyll/Page.hs+4−3 src/Text/Hakyll/Render/Internal.hs+2−2

src/Text/Hakyll/Page.hs+4−3

@@ -8,6 +8,7 @@ module Text.Hakyll.Page

99import qualified Data.Map as M

1010import qualified Data.List as L

11+import Data.Char (isSpace)

1112import Data.Maybe (fromMaybe)

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

1314import Control.Monad.Reader (liftIO)

@@ -121,16 +122,16 @@ readSection renderFunction isFirst ls

121122 | otherwise = body (tail ls)

122123 where

123124 isDelimiter' = isDelimiter (head ls)

124− isNamedDelimiter = head ls `matchesRegex` "----* *[a-zA-Z][a-zA-Z]*"

125+ isNamedDelimiter = head ls `matchesRegex` "----* *[a-zA-Z0-9][a-zA-Z0-9]*"

125126 body ls' = [("body", renderFunction $ unlines ls')]

126127

127− readSimpleMetaData = map readPair

128+ readSimpleMetaData = map readPair . filter (not . all isSpace)

128129 readPair = trimPair . break (== ':')

129130 trimPair (key, value) = (trim key, trim $ tail value)

130131

131132 readSectionMetaData [] = []

132133 readSectionMetaData (header:value) =

133− let key = substituteRegex "[^a-zA-Z]" "" header

134+ let key = substituteRegex "[^a-zA-Z0-9]" "" header

134135 in [(key, renderFunction $ unlines value)]

135136

136137-- | Read a page from a file. Metadata is supported, and if the filename

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

@@ -13,7 +13,7 @@ import qualified Data.Map as M

1313import Text.Hakyll.Context (Context, ContextManipulation)

1414import Control.Monad.Reader (liftIO)

1515import Data.List (isPrefixOf, foldl')

16−import Data.Char (isAlpha)

16+import Data.Char (isAlphaNum)

1717import Data.Maybe (fromMaybe)

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

1919

@@ -33,7 +33,7 @@ substitute escaper string context

3333 | otherwise = head string : substitute' tail'

3434 where

3535 tail' = tail string

36− (key, rest) = span isAlpha tail'

36+ (key, rest) = span isAlphaNum tail'

3737 replacement = fromMaybe ('$' : key) $ M.lookup key context

3838 substituteKey = replacement ++ substitute' rest

3939 substitute' str = substitute escaper str context