Skip to content
This repository has been archived by the owner on Jul 31, 2020. It is now read-only.

Commit

Permalink
Merge pull request #18 from matthewSorensen/master
Browse files Browse the repository at this point in the history
Updated blaze-html's version to >=0.5.0.0 && <0.6
  • Loading branch information
jgm committed Apr 24, 2012
2 parents e44f139 + cdc908d commit 996fd87
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Highlight.hs
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions Text/Highlighting/Kate.hs
Expand Up @@ -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
>
Expand Down
2 changes: 1 addition & 1 deletion Text/Highlighting/Kate/Format/HTML.hs
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions highlighting-kate.cabal
@@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 996fd87

Please sign in to comment.