hscolour 1.18 → 1.19

raw patch · 9 files changed

+22/−20 lines, 9 filesdep −haskell98dep ~basePVP ok

version bump matches the API change (PVP)

Dependencies removed: haskell98

Dependency ranges changed: base

API changes (from Hackage documentation)

Files

• HsColour.hs +6/−4
• Language/Haskell/HsColour.hs +2/−2
• Language/Haskell/HsColour/ANSI.hs +2/−2
• Language/Haskell/HsColour/Anchors.hs +2/−2
• Language/Haskell/HsColour/Classify.hs +2/−2
• Language/Haskell/HsColour/Colourise.hs +3/−3
• Language/Haskell/HsColour/HTML.hs +1/−1
• Language/Haskell/HsColour/MIRC.hs +1/−1
• hscolour.cabal +3/−3

@@ -6,10 +6,12 @@ import Language.Haskell.HsColour.Colourise (readColourPrefs) import Language.Haskell.HsColour.Options import Language.Haskell.HsColour.ACSS (breakS, srcModuleName)-import System-import IO+import System.Environment as System+import System.Exit+import System.IO hiding (withFile) import Control.Monad (when, forM_)-import List  (intersperse, isSuffixOf)+import Data.List  (intersperse, isSuffixOf)+import Control.Exception (bracket) --import Debug.Trace  -- Deal with UTF-8 I/O.@@ -18,7 +20,7 @@ import System.IO (hSetEncoding, utf8) #endif -version = "1.18"+version = "1.19"  optionTable :: [(String,Option)] optionTable = [ ("help",    Help)

@@ -24,8 +24,8 @@ import qualified Language.Haskell.HsColour.InlineCSS  as ICSS import qualified Language.Haskell.HsColour.LaTeX      as LaTeX import qualified Language.Haskell.HsColour.MIRC       as MIRC-import List(mapAccumL, isPrefixOf)-import Maybe+import Data.List(mapAccumL, isPrefixOf)+import Data.Maybe import Language.Haskell.HsColour.Output --import Debug.Trace 

@@ -18,8 +18,8 @@ import Language.Haskell.HsColour.ColourHighlight import Language.Haskell.HsColour.Output(TerminalType(..)) -import List (intersperse,isPrefixOf)-import Char (isDigit)+import Data.List (intersperse,isPrefixOf)+import Data.Char (isDigit)   

@@ -4,8 +4,8 @@  import Language.Haskell.HsColour.Classify import Language.Haskell.HsColour.General-import List-import Char+import Data.List+import Data.Char (isUpper, isLower, isDigit, ord, intToDigit)  -- This is an attempt to find the first defining occurrence of an -- identifier (function, datatype, class) in a Haskell source file.

@@ -3,8 +3,8 @@   , tokenise   ) where -import Char-import List+import Data.Char (isSpace, isUpper, isLower, isDigit)+import Data.List  -- | Lex Haskell source code into an annotated token stream, without --   discarding any characters or layout.

@@ -9,9 +9,9 @@ import Language.Haskell.HsColour.ColourHighlight import Language.Haskell.HsColour.Classify (TokenType(..)) -import IO (hPutStrLn,stderr)-import System (getEnv)-import List+import System.IO (hPutStrLn,stderr)+import System.Environment (getEnv)+import Data.List  -- | Colour preferences. data ColourPrefs = ColourPrefs

@@ -10,7 +10,7 @@ import Language.Haskell.HsColour.Classify as Classify import Language.Haskell.HsColour.Colourise -import Char(isAlphaNum)+import Data.Char(isAlphaNum) import Text.Printf  

@@ -5,7 +5,7 @@ import Language.Haskell.HsColour.Classify as Classify import Language.Haskell.HsColour.Colourise -import Char(isAlphaNum)+import Data.Char(isAlphaNum)   -- | Formats Haskell source code using mIRC codes.

@@ -1,5 +1,5 @@ Name: hscolour-Version: 1.18+Version: 1.19 Copyright: 2003-2011 Malcolm Wallace, University of York; 2006 Bjorn Bringert Maintainer: Malcolm Wallace Author: Malcolm Wallace@@ -24,7 +24,7 @@   Library-  Build-depends: haskell98, base < 10, containers+  Build-depends: base < 10, containers   Exposed-Modules:      Language.Haskell.HsColour     Language.Haskell.HsColour.ANSI@@ -47,7 +47,7 @@   Executable HsColour-  Build-depends: haskell98, base < 10, containers+  Build-depends: base < 10, containers   Main-is: HsColour.hs   --ghc-options: -O -W   Extensions: