0953d9a · hakyll · git.iko.soy

git.iko.soy/hakyll

Merge pull request #64 from markwright/master

changes for blaze-html 0.5

commit0953d9a842a9127d18f43a60cccdbde0be1e42dc authorJasper Van der Jeugt <jaspervdj@gmail.com> dateMon 23 Apr 2012, 06:17 (15 years ago) parent763c9ab fe1703b

5 files changed+10−8

compare with master

unifiedsplit

hakyll.cabal+2−1 src/Hakyll/Core/Writable.hs+2−2 src/Hakyll/Web/Blaze.hs+2−1 src/Hakyll/Web/Tags.hs+2−2 src/Hakyll/Web/Util/Html.hs+2−2

hakyll.cabal+2−1

@@ -61,7 +61,8 @@ Library

6161 Build-Depends:

6262 base >= 4 && < 5,

6363 binary >= 0.5 && < 0.6,

64− blaze-html >= 0.4 && < 0.6,

64+ blaze-html >= 0.5 && < 0.6,

65+ blaze-markup >= 0.5.1 && < 0.6,

6566 bytestring >= 0.9 && < 0.10,

6667 citeproc-hs >= 0.3.2 && < 0.4,

6768 containers >= 0.3 && < 0.5,

src/Hakyll/Core/Writable.hs+2−2

@@ -9,8 +9,8 @@ import Data.Word (Word8)

1010import qualified Data.ByteString as SB

1111import qualified Data.ByteString.Lazy as LB

12−import Text.Blaze (Html)

13−import Text.Blaze.Renderer.String (renderHtml)

12+import Text.Blaze.Html (Html)

13+import Text.Blaze.Html.Renderer.String (renderHtml)

1414

1515import Hakyll.Core.Identifier

1616

src/Hakyll/Web/Blaze.hs+2−1

@@ -7,7 +7,8 @@ module Hakyll.Web.Blaze

77 , getBodyHtml'

88 ) where

10−import Text.Blaze (Html, toHtml, preEscapedString)

10+import Text.Blaze.Html (Html, toHtml)

11+import Text.Blaze.Internal (preEscapedString)

1112

1213import Hakyll.Web.Page

1314import Hakyll.Web.Page.Metadata

src/Hakyll/Web/Tags.hs+2−2

@@ -52,8 +52,8 @@ import Data.Monoid (mconcat)

5252

5353import Data.Typeable (Typeable)

5454import Data.Binary (Binary, get, put)

55−import Text.Blaze.Renderer.String (renderHtml)

56−import Text.Blaze ((!), toHtml, toValue)

55+import Text.Blaze.Html.Renderer.String (renderHtml)

56+import Text.Blaze.Html ((!), toHtml, toValue)

5757import qualified Text.Blaze.Html5 as H

5858import qualified Text.Blaze.Html5.Attributes as A

5959

src/Hakyll/Web/Util/Html.hs+2−2

@@ -5,8 +5,8 @@ module Hakyll.Web.Util.Html

55 , escapeHtml

66 ) where

8−import Text.Blaze (toHtml)

9−import Text.Blaze.Renderer.String (renderHtml)

8+import Text.Blaze.Html (toHtml)

9+import Text.Blaze.Html.Renderer.String (renderHtml)

1010

1111-- | Strip all HTML tags from a string

1212--