diff options
author | Jasper Van der Jeugt <jaspervdj@gmail.com> | 2010-10-04 01:27:03 +0200 |
---|---|---|
committer | Jasper Van der Jeugt <jaspervdj@gmail.com> | 2010-10-04 01:27:03 +0200 |
commit | c73c09270d7605940c1064aef50675c0cff912c8 (patch) | |
tree | 1d30f29f4fad57bddb0a8eb40650f78b633ed078 | |
parent | 08c4d74a2fe9c667e725f2ebb41bc01006a703a1 (diff) | |
download | hakyll-c73c09270d7605940c1064aef50675c0cff912c8.tar.gz |
Clean up modules a bit
-rw-r--r-- | hakyll.cabal | 5 | ||||
-rw-r--r-- | src/Text/Hakyll.hs | 4 | ||||
-rw-r--r-- | src/Text/Hakyll/CreateContext.hs | 2 | ||||
-rw-r--r-- | src/Text/Hakyll/Internal/Template.hs | 2 | ||||
-rw-r--r-- | src/Text/Hakyll/Page.hs (renamed from src/Text/Hakyll/Internal/Page.hs) | 2 | ||||
-rw-r--r-- | src/Text/Hakyll/Pandoc.hs | 8 |
6 files changed, 16 insertions, 7 deletions
diff --git a/hakyll.cabal b/hakyll.cabal index 512fabc..1849bd4 100644 --- a/hakyll.cabal +++ b/hakyll.cabal @@ -1,5 +1,5 @@ Name: hakyll -Version: 2.3.2 +Version: 2.4 Synopsis: A simple static site generator library. Description: A simple static site generator library, mainly aimed at @@ -53,6 +53,8 @@ library Text.Hakyll.Render Text.Hakyll.HakyllAction Text.Hakyll.Paginate + Text.Hakyll.Page + Text.Hakyll.Pandoc Text.Hakyll.Util Text.Hakyll.Tags Text.Hakyll.Feed @@ -61,7 +63,6 @@ library Text.Hakyll.Internal.Cache Text.Hakyll.Internal.CompressCss Text.Hakyll.Internal.FileType - Text.Hakyll.Internal.Page Text.Hakyll.Internal.Template Text.Hakyll.Internal.Template.Template Text.Hakyll.Internal.Template.Hamlet diff --git a/src/Text/Hakyll.hs b/src/Text/Hakyll.hs index 506a0a9..b0fe479 100644 --- a/src/Text/Hakyll.hs +++ b/src/Text/Hakyll.hs @@ -22,6 +22,8 @@ module Text.Hakyll , module Text.Hakyll.Render , module Text.Hakyll.HakyllAction , module Text.Hakyll.Paginate + , module Text.Hakyll.Page + , module Text.Hakyll.Pandoc , module Text.Hakyll.Util , module Text.Hakyll.Tags , module Text.Hakyll.Feed @@ -49,6 +51,8 @@ import Text.Hakyll.Regex import Text.Hakyll.Render import Text.Hakyll.HakyllAction import Text.Hakyll.Paginate +import Text.Hakyll.Page +import Text.Hakyll.Pandoc import Text.Hakyll.Util import Text.Hakyll.Tags import Text.Hakyll.Feed diff --git a/src/Text/Hakyll/CreateContext.hs b/src/Text/Hakyll/CreateContext.hs index d9499ea..a9c3a95 100644 --- a/src/Text/Hakyll/CreateContext.hs +++ b/src/Text/Hakyll/CreateContext.hs @@ -18,7 +18,7 @@ import Control.Arrow ((>>>)) import Text.Hakyll.Context import Text.Hakyll.HakyllAction import Text.Hakyll.Render -import Text.Hakyll.Internal.Page +import Text.Hakyll.Page import Text.Hakyll.Pandoc import Text.Hakyll.Internal.Cache diff --git a/src/Text/Hakyll/Internal/Template.hs b/src/Text/Hakyll/Internal/Template.hs index 9b9d9cf..59235cc 100644 --- a/src/Text/Hakyll/Internal/Template.hs +++ b/src/Text/Hakyll/Internal/Template.hs @@ -20,7 +20,7 @@ import Text.Hakyll.HakyllMonad (Hakyll) import Text.Hakyll.HakyllAction import Text.Hakyll.Pandoc import Text.Hakyll.Internal.Cache -import Text.Hakyll.Internal.Page +import Text.Hakyll.Page import Text.Hakyll.Internal.Template.Template import Text.Hakyll.Internal.Template.Hamlet diff --git a/src/Text/Hakyll/Internal/Page.hs b/src/Text/Hakyll/Page.hs index 9e715d5..fc0498e 100644 --- a/src/Text/Hakyll/Internal/Page.hs +++ b/src/Text/Hakyll/Page.hs @@ -1,5 +1,5 @@ -- | A module for dealing with @Page@s. This module is mostly internally used. -module Text.Hakyll.Internal.Page +module Text.Hakyll.Page ( PageSection (..) , readPage , readPageAction diff --git a/src/Text/Hakyll/Pandoc.hs b/src/Text/Hakyll/Pandoc.hs index 9dbe3d4..f6c8383 100644 --- a/src/Text/Hakyll/Pandoc.hs +++ b/src/Text/Hakyll/Pandoc.hs @@ -1,4 +1,8 @@ -module Text.Hakyll.Pandoc where +-- | Module exporting a pandoc arrow +-- +module Text.Hakyll.Pandoc + ( renderAction + ) where import Data.Maybe (fromMaybe) import qualified Data.Map as M @@ -7,7 +11,7 @@ import Control.Arrow (second) import Text.Pandoc import Text.Hakyll.Internal.FileType -import Text.Hakyll.Internal.Page +import Text.Hakyll.Page import Text.Hakyll.HakyllMonad import Text.Hakyll.HakyllAction import Text.Hakyll.Context |