summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrentYorgey <>2016-10-27 05:09:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2016-10-27 05:09:00 (GMT)
commit7d29f61d63dc11fecd929c849c78228f933f83e3 (patch)
treee1e57359fb80834581e6e3eab187975ea901898e
parent30e3f3263079681d2293552b68ea118cef7f5ebd (diff)
version 1.4HEAD1.4master
-rw-r--r--CHANGELOG.md4
-rw-r--r--diagrams-cairo.cabal8
-rw-r--r--src/Diagrams/Backend/Cairo/Internal.hs10
3 files changed, 13 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e687536..a5fb23b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [v1.4](https://github.com/diagrams/diagrams-cairo/tree/v1.4) (2016-10-26)
+
+- No significant changes, just bumping version for diagrams 1.4 release
+
## [v1.3.1.2](https://github.com/diagrams/diagrams-cairo/tree/v1.3.1.2) (2016-08-22)
- Require `optparse-applicative-0.13` and fix compilation error
diff --git a/diagrams-cairo.cabal b/diagrams-cairo.cabal
index 2fdbc00..4271fb8 100644
--- a/diagrams-cairo.cabal
+++ b/diagrams-cairo.cabal
@@ -1,5 +1,5 @@
Name: diagrams-cairo
-Version: 1.3.1.2
+Version: 1.4
Synopsis: Cairo backend for diagrams drawing EDSL
Description: A full-featured backend for rendering
diagrams using the cairo rendering engine.
@@ -56,14 +56,14 @@ Library
Build-depends: base >= 4.2 && < 4.10,
mtl >= 2.0 && < 2.3,
filepath,
- diagrams-core >= 1.3 && < 1.4,
- diagrams-lib >= 1.3 && < 1.4,
+ diagrams-core >= 1.3 && < 1.5,
+ diagrams-lib >= 1.3 && < 1.5,
cairo >= 0.12.4 && < 0.14,
pango >= 0.12.5 && < 0.14,
colour,
split >= 0.1.2 && < 0.3,
containers >= 0.3 && < 0.6,
- lens >= 3.8 && < 4.15,
+ lens >= 3.8 && < 4.16,
data-default-class >= 0.0.1 && < 0.2,
statestack >= 0.2 && < 0.3,
JuicyPixels >= 3.1.3.2 && < 3.3,
diff --git a/src/Diagrams/Backend/Cairo/Internal.hs b/src/Diagrams/Backend/Cairo/Internal.hs
index 98a81fc..07facfb 100644
--- a/src/Diagrams/Backend/Cairo/Internal.hs
+++ b/src/Diagrams/Backend/Cairo/Internal.hs
@@ -5,11 +5,11 @@
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE GADTs #-}
{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE TypeSynonymInstances #-}
{-# LANGUAGE ViewPatterns #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-----------------------------------------------------------------------------
-- |
@@ -53,7 +53,8 @@ import qualified Graphics.Rendering.Cairo.Matrix as CM
import qualified Graphics.Rendering.Pango as P
import Codec.Picture
-import Codec.Picture.Types (convertImage, promoteImage, packPixel)
+import Codec.Picture.Types (convertImage, packPixel,
+ promoteImage)
import Control.Exception (try)
@@ -61,15 +62,15 @@ import Control.Monad (when)
import Control.Monad.IO.Class
import qualified Control.Monad.StateStack as SS
import Control.Monad.Trans (lift)
+import qualified Data.Array.MArray as MA
+import Data.Bits (rotateL, (.&.))
import qualified Data.Foldable as F
import Data.Hashable (Hashable (..))
import Data.List (isSuffixOf)
import Data.Maybe (catMaybes, fromMaybe, isJust)
import Data.Tree
import Data.Typeable
-import qualified Data.Array.MArray as MA
import Data.Word (Word32)
-import Data.Bits (rotateL, (.&.))
import GHC.Generics (Generic)
-- | This data declaration is simply used as a token to distinguish
@@ -254,7 +255,6 @@ fromFontSlant FontSlantItalic = P.StyleItalic
fromFontSlant FontSlantOblique = P.StyleOblique
fromFontWeight :: FontWeight -> P.Weight
-fromFontWeight FontWeightNormal = P.WeightNormal
fromFontWeight FontWeightBold = P.WeightBold
fromFontWeight _ = P.WeightNormal