Permalink
Browse files

Merge pull request #18 from matthewSorensen/master

Updated blaze-html's version to >=0.5.0.0 && <0.6
  • Loading branch information...
2 parents e44f139 + cdc908d commit 996fd87aea60c4f2215a573821cf9fb56b4d82cd @jgm committed Apr 24, 2012
Showing with 8 additions and 8 deletions.
  1. +2 −2 Highlight.hs
  2. +2 −2 Text/Highlighting/Kate.hs
  3. +1 −1 Text/Highlighting/Kate/Format/HTML.hs
  4. +3 −3 highlighting-kate.cabal
View
@@ -8,8 +8,8 @@ import System.Exit
import System.FilePath (takeFileName)
import Data.Maybe (listToMaybe)
import Data.Char (toLower)
-import Text.Blaze.Renderer.String
-import Text.Blaze
+import Text.Blaze.Html.Renderer.String
+import Text.Blaze.Html
import qualified Text.Blaze.Html5 as H
import qualified Text.Blaze.Html5.Attributes as A
@@ -14,8 +14,8 @@ A typical application will combine a highlighter and a formatter.
This one reads ruby code from stdin and writes HTML:
> import Text.Highlighting.Kate
-> import Text.Blaze.Renderer.String (renderHtml)
-> import Text.Blaze (toHtml)
+> import Text.Blaze.Html.Renderer.String (renderHtml)
+> import Text.Blaze.Html (toHtml)
> import Text.Blaze.Html5 as H
> import Text.Blaze.Html5.Attributes as A
>
@@ -14,7 +14,7 @@ module Text.Highlighting.Kate.Format.HTML (
formatHtmlInline, formatHtmlBlock, styleToCss
) where
import Text.Highlighting.Kate.Types
-import Text.Blaze
+import Text.Blaze.Html
import qualified Text.Blaze.Html5 as H
import qualified Text.Blaze.Html5.Attributes as A
import Data.Monoid
@@ -1,5 +1,5 @@
Name: highlighting-kate
-Version: 0.5.0.5
+Version: 0.5.0.6
Cabal-Version: >= 1.6
Build-Type: Simple
Category: Text
@@ -146,7 +146,7 @@ Library
cpp-options: -D_PCRE_LIGHT
else
Build-depends: regex-pcre-builtin
- Build-Depends: parsec, mtl, blaze-html >= 0.4.2 && < 0.5
+ Build-Depends: parsec, mtl, blaze-html >= 0.5.0.0 && < 0.6
Exposed-Modules: Text.Highlighting.Kate
Text.Highlighting.Kate.Syntax
Text.Highlighting.Kate.Types
@@ -255,7 +255,7 @@ Library
Executable Highlight
Main-Is: Highlight.hs
- Build-Depends: base, containers, blaze-html >= 0.4.2 && < 0.5, filepath
+ Build-Depends: base, containers, blaze-html >= 0.5.0.0 && < 0.6, filepath
if flag(pcre-light)
cpp-options: -D_PCRE_LIGHT
Ghc-Options: -W -O0 -rtsopts

0 comments on commit 996fd87

Please sign in to comment.