diff options
| author | Jasper Van der Jeugt <m@jaspervdj.be> | 2012-12-16 10:05:21 +0100 |
|---|---|---|
| committer | Jasper Van der Jeugt <m@jaspervdj.be> | 2012-12-16 10:05:21 +0100 |
| commit | 918ed3c3fab736bb6b3b72724bdcb07e33d87a0b (patch) | |
| tree | 60f29a4b048b635a17941870b097a77e7dd29ea0 | |
| parent | 8a8dade15ffc84f543fc3774f7a0a8fac4835bd2 (diff) | |
| download | hakyll-918ed3c3fab736bb6b3b72724bdcb07e33d87a0b.tar.gz | |
Small fixes
| -rw-r--r-- | web/site.hs | 4 | ||||
| -rw-r--r-- | web/tutorials/03-rules-routes-compilers.markdown | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/web/site.hs b/web/site.hs index f106ca7..f8b3794 100644 --- a/web/site.hs +++ b/web/site.hs @@ -21,14 +21,14 @@ main = hakyllWith config $ do -- Pages match "*.markdown" $ do route $ setExtension "html" - compile $ pageCompiler + compile $ pandocCompiler >>= loadAndApplyTemplate "templates/default.html" defaultContext >>= relativizeUrls -- Tutorials match "tutorials/*" $ do route $ setExtension "html" - compile $ pageCompilerWith defaultHakyllParserState withToc + compile $ pandocCompilerWith defaultHakyllParserState withToc >>= loadAndApplyTemplate "templates/tutorial.html" defaultContext >>= loadAndApplyTemplate "templates/default.html" defaultContext >>= relativizeUrls diff --git a/web/tutorials/03-rules-routes-compilers.markdown b/web/tutorials/03-rules-routes-compilers.markdown index b3bf4ee..b9e1c61 100644 --- a/web/tutorials/03-rules-routes-compilers.markdown +++ b/web/tutorials/03-rules-routes-compilers.markdown @@ -37,7 +37,7 @@ match "css/*" $ do ``` This is a declarative DSL: the order in which you write the rules make little -difference: Hakyll will use dependency tracking to determine the correct order. +difference, Hakyll will use dependency tracking to determine the correct order. We group the different rules using `match`. The first argument for `match` is a [Pattern]. The `OverloadedStrings` extension allows us to just write `String`s @@ -53,11 +53,11 @@ The `route` function is used for determining the output file. For example, you probably want to write the processed contents of `contact.markdown` to `_site/contact.html` and not `_site/contact.markdown`. -`idRoute` is a commonly used and just keeps the filename. We use this for e.g. -the images and CSS files. +`idRoute` is a commonly used route and just keeps the filename. We use this for +e.g. the images and CSS files. `setExtension` is another common route which takes a single argument: the -extension of the resulting file. In order to route `contact.markdown` to +desired extension of the resulting file. In order to route `contact.markdown` to `_site/contact.html`, use: ```haskell |