Merge pull request #64 from markwright/master
changes for blaze-html 0.5
This commit is contained in:
commit
0953d9a842
5 changed files with 10 additions and 8 deletions
|
@ -61,7 +61,8 @@ Library
|
||||||
Build-Depends:
|
Build-Depends:
|
||||||
base >= 4 && < 5,
|
base >= 4 && < 5,
|
||||||
binary >= 0.5 && < 0.6,
|
binary >= 0.5 && < 0.6,
|
||||||
blaze-html >= 0.4 && < 0.6,
|
blaze-html >= 0.5 && < 0.6,
|
||||||
|
blaze-markup >= 0.5.1 && < 0.6,
|
||||||
bytestring >= 0.9 && < 0.10,
|
bytestring >= 0.9 && < 0.10,
|
||||||
citeproc-hs >= 0.3.2 && < 0.4,
|
citeproc-hs >= 0.3.2 && < 0.4,
|
||||||
containers >= 0.3 && < 0.5,
|
containers >= 0.3 && < 0.5,
|
||||||
|
|
|
@ -9,8 +9,8 @@ import Data.Word (Word8)
|
||||||
|
|
||||||
import qualified Data.ByteString as SB
|
import qualified Data.ByteString as SB
|
||||||
import qualified Data.ByteString.Lazy as LB
|
import qualified Data.ByteString.Lazy as LB
|
||||||
import Text.Blaze (Html)
|
import Text.Blaze.Html (Html)
|
||||||
import Text.Blaze.Renderer.String (renderHtml)
|
import Text.Blaze.Html.Renderer.String (renderHtml)
|
||||||
|
|
||||||
import Hakyll.Core.Identifier
|
import Hakyll.Core.Identifier
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,8 @@ module Hakyll.Web.Blaze
|
||||||
, getBodyHtml'
|
, getBodyHtml'
|
||||||
) where
|
) where
|
||||||
|
|
||||||
import Text.Blaze (Html, toHtml, preEscapedString)
|
import Text.Blaze.Html (Html, toHtml)
|
||||||
|
import Text.Blaze.Internal (preEscapedString)
|
||||||
|
|
||||||
import Hakyll.Web.Page
|
import Hakyll.Web.Page
|
||||||
import Hakyll.Web.Page.Metadata
|
import Hakyll.Web.Page.Metadata
|
||||||
|
|
|
@ -52,8 +52,8 @@ import Data.Monoid (mconcat)
|
||||||
|
|
||||||
import Data.Typeable (Typeable)
|
import Data.Typeable (Typeable)
|
||||||
import Data.Binary (Binary, get, put)
|
import Data.Binary (Binary, get, put)
|
||||||
import Text.Blaze.Renderer.String (renderHtml)
|
import Text.Blaze.Html.Renderer.String (renderHtml)
|
||||||
import Text.Blaze ((!), toHtml, toValue)
|
import Text.Blaze.Html ((!), toHtml, toValue)
|
||||||
import qualified Text.Blaze.Html5 as H
|
import qualified Text.Blaze.Html5 as H
|
||||||
import qualified Text.Blaze.Html5.Attributes as A
|
import qualified Text.Blaze.Html5.Attributes as A
|
||||||
|
|
||||||
|
|
|
@ -5,8 +5,8 @@ module Hakyll.Web.Util.Html
|
||||||
, escapeHtml
|
, escapeHtml
|
||||||
) where
|
) where
|
||||||
|
|
||||||
import Text.Blaze (toHtml)
|
import Text.Blaze.Html (toHtml)
|
||||||
import Text.Blaze.Renderer.String (renderHtml)
|
import Text.Blaze.Html.Renderer.String (renderHtml)
|
||||||
|
|
||||||
-- | Strip all HTML tags from a string
|
-- | Strip all HTML tags from a string
|
||||||
--
|
--
|
||||||
|
|
Loading…
Reference in a new issue