on master help sign in
Small fixes
918ed3cJasper Van der Jeugt
web/site.hs+2−2
@@ -21,14 +21,14 @@ main = hakyllWith config $ do
21 -- Pages
21 -- Pages
22 match "*.markdown" $ do
22 match "*.markdown" $ do
23 route $ setExtension "html"
23 route $ setExtension "html"
24− compile $ pageCompiler
24+ compile $ pandocCompiler
25 >>= loadAndApplyTemplate "templates/default.html" defaultContext
25 >>= loadAndApplyTemplate "templates/default.html" defaultContext
26 >>= relativizeUrls
26 >>= relativizeUrls
27
27
28 -- Tutorials
28 -- Tutorials
29 match "tutorials/*" $ do
29 match "tutorials/*" $ do
30 route $ setExtension "html"
30 route $ setExtension "html"
31− compile $ pageCompilerWith defaultHakyllParserState withToc
31+ compile $ pandocCompilerWith defaultHakyllParserState withToc
32 >>= loadAndApplyTemplate "templates/tutorial.html" defaultContext
32 >>= loadAndApplyTemplate "templates/tutorial.html" defaultContext
33 >>= loadAndApplyTemplate "templates/default.html" defaultContext
33 >>= loadAndApplyTemplate "templates/default.html" defaultContext
34 >>= relativizeUrls
34 >>= relativizeUrls
web/tutorials/03-rules-routes-compilers.markdown+4−4
@@ -37,7 +37,7 @@ match "css/*" $ do
37```
37```
38
38
39This is a declarative DSL: the order in which you write the rules make little
39This is a declarative DSL: the order in which you write the rules make little
40−difference: Hakyll will use dependency tracking to determine the correct order.
40+difference, Hakyll will use dependency tracking to determine the correct order.
41
41
42We group the different rules using `match`. The first argument for `match` is a
42We group the different rules using `match`. The first argument for `match` is a
43[Pattern]. The `OverloadedStrings` extension allows us to just write `String`s
43[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
53probably want to write the processed contents of `contact.markdown` to
53probably want to write the processed contents of `contact.markdown` to
54`_site/contact.html` and not `_site/contact.markdown`.
54`_site/contact.html` and not `_site/contact.markdown`.
55
55
56−`idRoute` is a commonly used and just keeps the filename. We use this for e.g.
56+`idRoute` is a commonly used route and just keeps the filename. We use this for
57−the images and CSS files.
57+e.g. the images and CSS files.
58
58
59`setExtension` is another common route which takes a single argument: the
59`setExtension` is another common route which takes a single argument: the
60−extension of the resulting file. In order to route `contact.markdown` to
60+desired extension of the resulting file. In order to route `contact.markdown` to
61`_site/contact.html`, use:
61`_site/contact.html`, use:
62
62
63```haskell
63```haskell