diagrams-lib 1.4.2.1 → 1.4.2.2

raw patch · 47 files changed

+108/−10 lines, 47 filesdep ~basedep ~diagrams-coredep ~fsnotifyPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependency ranges changed: base, diagrams-core, fsnotify, monoid-extras, tasty

API changes (from Hackage documentation)

Files

• CHANGELOG.md +4/−0
• diagrams-lib.cabal +2/−2
• src/Diagrams/Align.hs +1/−0
• src/Diagrams/Angle.hs +1/−0
• src/Diagrams/Animation.hs +1/−0
• src/Diagrams/Attributes.hs +1/−0
• src/Diagrams/BoundingBox.hs +1/−0
• src/Diagrams/Combinators.hs +1/−0
• src/Diagrams/CubicSpline.hs +1/−0
• src/Diagrams/Deform.hs +1/−0
• src/Diagrams/LinearMap.hs +1/−0
• src/Diagrams/Located.hs +1/−0
• src/Diagrams/Names.hs +5/−0
• src/Diagrams/Path.hs +5/−0
• src/Diagrams/Segment.hs +1/−0
• src/Diagrams/Size.hs +1/−0
• src/Diagrams/Tangent.hs +1/−0
• src/Diagrams/ThreeD/Align.hs +1/−0
• src/Diagrams/ThreeD/Light.hs +1/−0
• src/Diagrams/ThreeD/Shapes.hs +1/−0
• src/Diagrams/ThreeD/Size.hs +1/−0
• src/Diagrams/ThreeD/Transform.hs +5/−0
• src/Diagrams/Trace.hs +5/−0
• src/Diagrams/Trail.hs +15/−1
• src/Diagrams/TrailLike.hs +1/−0
• src/Diagrams/Transform.hs +5/−0
• src/Diagrams/Transform/Matrix.hs +4/−2
• src/Diagrams/TwoD/Adjust.hs +7/−3
• src/Diagrams/TwoD/Align.hs +1/−0
• src/Diagrams/TwoD/Arc.hs +1/−0
• src/Diagrams/TwoD/Arrow.hs +1/−0
• src/Diagrams/TwoD/Arrowheads.hs +1/−0
• src/Diagrams/TwoD/Attributes.hs +1/−0
• src/Diagrams/TwoD/Combinators.hs +1/−0
• src/Diagrams/TwoD/Image.hs +1/−0
• src/Diagrams/TwoD/Model.hs +1/−0
• src/Diagrams/TwoD/Offset.hs +4/−0
• src/Diagrams/TwoD/Path.hs +1/−0
• src/Diagrams/TwoD/Points.hs +1/−0
• src/Diagrams/TwoD/Polygons.hs +1/−0
• src/Diagrams/TwoD/Segment.hs +1/−0
• src/Diagrams/TwoD/Shapes.hs +4/−0
• src/Diagrams/TwoD/Size.hs +1/−0
• src/Diagrams/TwoD/Text.hs +1/−0
• src/Diagrams/TwoD/Transform.hs +7/−2
• test/Diagrams/Test/Transform.hs +2/−0
• test/Speed.hs +2/−0

@@ -1,3 +1,7 @@+## [v1.4.2.2](https://github.com/diagrams/diagrams-lib/tree/v1.4.2.2) (2018-05-08)++- Fixes for GHC < 8.0+ ## [v1.4.2.1](https://github.com/diagrams/diagrams-lib/tree/v1.4.2.1) (2018-04-13)  - Allow `base-4.11` (GHC 8.4)

@@ -1,5 +1,5 @@ Name:                diagrams-lib-Version:             1.4.2.1+Version:             1.4.2.2 Synopsis:            Embedded domain-specific language for declarative graphics Description:         Diagrams is a flexible, extensible EDSL for creating                      graphics of many types.  Graphics can be created@@ -21,7 +21,7 @@ Cabal-version:       1.18 Extra-source-files:  CHANGELOG.md, README.markdown, diagrams/*.svg Extra-doc-files:     diagrams/*.svg-Tested-with:         GHC == 7.8.4, GHC == 7.10.2, GHC == 8.0.1, GHC == 8.2.2, GHC == 8.4.1+Tested-with:         GHC == 7.8.4, GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.2 Source-repository head   type:     git   location: http://github.com/diagrams/diagrams-lib.git

@@ -1,3 +1,4 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE ConstrainedClassMethods     #-} {-# LANGUAGE FlexibleContexts     #-} {-# LANGUAGE TypeFamilies         #-}

@@ -1,3 +1,4 @@+{-# LANGUAGE ConstraintKinds            #-} {-# LANGUAGE DeriveFunctor              #-} {-# LANGUAGE FlexibleContexts           #-} {-# LANGUAGE FlexibleInstances          #-}

@@ -1,3 +1,4 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE CPP                   #-} {-# LANGUAGE FlexibleContexts      #-} {-# LANGUAGE MultiParamTypeClasses #-}

@@ -1,3 +1,4 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE CPP                        #-} {-# LANGUAGE DeriveDataTypeable         #-} {-# LANGUAGE DeriveFunctor              #-}

@@ -1,3 +1,4 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE DeriveFunctor              #-} {-# LANGUAGE FlexibleContexts           #-} {-# LANGUAGE FlexibleInstances          #-}

@@ -1,3 +1,4 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE FlexibleContexts      #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE Rank2Types            #-}

@@ -1,3 +1,4 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE TypeFamilies     #-} {-# OPTIONS_GHC -fno-warn-incomplete-patterns #-}

@@ -1,3 +1,4 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE FlexibleContexts      #-} {-# LANGUAGE FlexibleInstances     #-} {-# LANGUAGE MultiParamTypeClasses #-}

@@ -1,3 +1,4 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE ConstraintKinds       #-} {-# LANGUAGE FlexibleContexts      #-} {-# LANGUAGE FlexibleInstances     #-}

@@ -1,3 +1,4 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE CPP                   #-} {-# LANGUAGE FlexibleContexts      #-} {-# LANGUAGE MultiParamTypeClasses #-}

@@ -1,5 +1,10 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE MonoLocalBinds   #-}++{-# OPTIONS_GHC -fno-warn-unused-imports #-}+  -- for Data.Semigroup+ ----------------------------------------------------------------------------- -- | -- Module      :  Diagrams.Names

@@ -1,3 +1,4 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE CPP                        #-} #if __GLASGOW_HASKELL__ >= 707 {-# LANGUAGE DeriveDataTypeable         #-}@@ -12,6 +13,10 @@ {-# LANGUAGE UndecidableInstances       #-} {-# LANGUAGE ViewPatterns               #-} {-# LANGUAGE DeriveGeneric              #-}++{-# OPTIONS_GHC -fno-warn-unused-imports #-}+  -- for Data.Semigroup+ ----------------------------------------------------------------------------- -- | -- Module      :  Diagrams.Path

@@ -1,3 +1,4 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE BangPatterns               #-} {-# LANGUAGE DeriveFunctor              #-} {-# LANGUAGE EmptyDataDecls             #-}

@@ -1,3 +1,4 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE CPP                        #-} #if __GLASGOW_HASKELL__ >= 707 {-# LANGUAGE DeriveDataTypeable         #-}

@@ -1,3 +1,4 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE GADTs                #-} -- for ghc < 7.8, TypeFamilies covers GADT patten mathcing in > 7.8 {-# LANGUAGE FlexibleContexts     #-} {-# LANGUAGE FlexibleInstances    #-}

@@ -1,3 +1,4 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE TypeFamilies    #-}  -----------------------------------------------------------------------------

@@ -1,3 +1,4 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE DeriveDataTypeable    #-} {-# LANGUAGE FlexibleContexts      #-} {-# LANGUAGE MultiParamTypeClasses #-}

@@ -1,3 +1,4 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE CPP                   #-} {-# LANGUAGE DeriveDataTypeable    #-} {-# LANGUAGE FlexibleContexts      #-}

@@ -1,3 +1,4 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE TypeFamilies     #-} 

@@ -1,3 +1,4 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE FlexibleContexts      #-} {-# LANGUAGE FlexibleInstances     #-} {-# LANGUAGE MultiParamTypeClasses #-}@@ -5,6 +6,10 @@ {-# LANGUAGE TypeFamilies          #-} {-# LANGUAGE TypeOperators         #-} {-# LANGUAGE ViewPatterns          #-}++{-# OPTIONS_GHC -fno-warn-unused-imports #-}+  -- for Data.Semigroup+ ----------------------------------------------------------------------------- -- | -- Module      :  Diagrams.ThreeD.Transform

@@ -1,5 +1,10 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE MonoLocalBinds   #-}++{-# OPTIONS_GHC -fno-warn-unused-imports #-}+  -- for Data.Semigroup+ ----------------------------------------------------------------------------- -- | -- Module      :  Diagrams.Trace

@@ -1,3 +1,5 @@+{-# LANGUAGE ConstraintKinds #-}+{-# LANGUAGE CPP                        #-} {-# LANGUAGE EmptyDataDecls             #-} {-# LANGUAGE FlexibleContexts           #-} {-# LANGUAGE FlexibleInstances          #-}@@ -174,7 +176,19 @@ --   beginning which have a combined arc length of at least 5).  newtype SegTree v n = SegTree (FingerTree (SegMeasure v n) (Segment Closed v n))-  deriving (Eq, Ord, Show, Monoid, Semigroup, Transformable, FT.Measured (SegMeasure v n))+  deriving (Eq, Ord, Show, Monoid, Transformable, FT.Measured (SegMeasure v n))++-- Only derive the Semigroup instance for versions of base that+-- include Semigroup.  This is because the fingertree package has+-- similar CPP to only export a Semigroup instance for those versions+-- of base, so for GHC 7.10 and earlier we get a 'no instance found'+-- error when trying to derive the Semigroup instance for SegTree.  It+-- would also be possible to depend on the 'semigroups' package in+-- order to get the Semigroup class regardless of base version, but+-- presumably fingertree didn't want to add a dependency.+#if MIN_VERSION_base(4,9,0)+deriving instance (Ord n, Floating n, Metric v) => Semigroup (SegTree v n)+#endif  instance Wrapped (SegTree v n) where   type Unwrapped (SegTree v n) = FingerTree (SegMeasure v n) (Segment Closed v n)

@@ -1,3 +1,4 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE FlexibleContexts     #-} {-# LANGUAGE FlexibleInstances    #-} {-# LANGUAGE TypeFamilies         #-}

@@ -1,6 +1,11 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE RankNTypes            #-} {-# LANGUAGE TypeFamilies          #-}++{-# OPTIONS_GHC -fno-warn-unused-imports #-}+  -- for Data.Semigroup+ ----------------------------------------------------------------------------- -- | -- Module      :  Diagrams.Transform

@@ -1,5 +1,7 @@-{-# LANGUAGE CPP            #-}-{-# LANGUAGE MonoLocalBinds #-}+{-# LANGUAGE ConstraintKinds #-}+{-# LANGUAGE CPP             #-}+{-# LANGUAGE MonoLocalBinds  #-}+{-# LANGUAGE TypeFamilies    #-}  ----------------------------------------------------------------------------- -- |

@@ -1,7 +1,11 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE Rank2Types       #-} {-# LANGUAGE TypeFamilies     #-} +{-# OPTIONS_GHC -fno-warn-unused-imports #-}+  -- for Data.Semigroup+ ----------------------------------------------------------------------------- -- | -- Module      :  Diagrams.TwoD.Adjust@@ -21,14 +25,14 @@     ) where  import           Diagrams.Attributes+import           Diagrams.BoundingBox import           Diagrams.Core+import           Diagrams.Size import           Diagrams.TwoD.Attributes (lineTextureA) import           Diagrams.TwoD.Types import           Diagrams.Util            (( # ))-import           Diagrams.Size-import           Diagrams.BoundingBox -import           Control.Lens             (Lens', (^.),  set)+import           Control.Lens             (Lens', set, (^.)) import           Data.Default.Class import           Data.Semigroup 

@@ -1,3 +1,4 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE TypeFamilies     #-} 

@@ -1,3 +1,4 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE ViewPatterns     #-} {-# LANGUAGE TypeFamilies     #-}

@@ -1,3 +1,4 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE CPP                        #-} {-# LANGUAGE DeriveDataTypeable         #-} {-# LANGUAGE FlexibleContexts           #-}

@@ -1,3 +1,4 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE FlexibleContexts          #-} {-# LANGUAGE NoMonomorphismRestriction #-} {-# LANGUAGE ScopedTypeVariables       #-}

@@ -1,3 +1,4 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE CPP                        #-} {-# LANGUAGE DeriveDataTypeable         #-} {-# LANGUAGE DeriveFunctor              #-}

@@ -1,3 +1,4 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE FlexibleContexts      #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE ScopedTypeVariables   #-}

@@ -1,3 +1,4 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE DeriveDataTypeable    #-} {-# LANGUAGE EmptyDataDecls        #-} {-# LANGUAGE FlexibleContexts      #-}

@@ -1,3 +1,4 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE FlexibleContexts      #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE TemplateHaskell       #-}

@@ -1,3 +1,4 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE FlexibleContexts     #-} {-# LANGUAGE GADTs                #-} {-# LANGUAGE StandaloneDeriving   #-}@@ -5,6 +6,9 @@ {-# LANGUAGE TypeFamilies         #-} {-# LANGUAGE UndecidableInstances #-} {-# LANGUAGE ViewPatterns         #-}++{-# OPTIONS_GHC -fno-warn-unused-imports #-}+  -- for Data.Semigroup  ----------------------------------------------------------------------------- -- |

@@ -1,3 +1,4 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE DeriveDataTypeable         #-} {-# LANGUAGE FlexibleContexts           #-} {-# LANGUAGE FlexibleInstances          #-}

@@ -1,3 +1,4 @@+{-# LANGUAGE ConstraintKinds #-} ----------------------------------------------------------------------------- -- | -- Module      :  Diagrams.TwoD.Points

@@ -1,3 +1,4 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE CPP       #-} {-# LANGUAGE DeriveFunctor       #-} {-# LANGUAGE FlexibleContexts    #-}

@@ -1,3 +1,4 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE FlexibleContexts     #-} {-# LANGUAGE FlexibleInstances    #-} {-# LANGUAGE TypeFamilies         #-}

@@ -1,6 +1,10 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE TemplateHaskell  #-} {-# LANGUAGE TypeFamilies     #-}++{-# OPTIONS_GHC -fno-warn-unused-imports #-}+  -- for Data.Semigroup  ----------------------------------------------------------------------------- -- |

@@ -1,3 +1,4 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE TypeFamilies     #-} 

@@ -1,3 +1,4 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE CPP                        #-} {-# LANGUAGE DeriveDataTypeable         #-} {-# LANGUAGE FlexibleContexts           #-}

@@ -1,3 +1,4 @@+{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE FlexibleContexts      #-} {-# LANGUAGE FlexibleInstances     #-} {-# LANGUAGE MultiParamTypeClasses #-}@@ -5,6 +6,10 @@ {-# LANGUAGE TypeFamilies          #-} {-# LANGUAGE TypeOperators         #-} {-# LANGUAGE ViewPatterns          #-}++{-# OPTIONS_GHC -fno-warn-unused-imports #-}+  -- for Data.Semigroup+ ----------------------------------------------------------------------------- -- | -- Module      :  Diagrams.TwoD.Transform@@ -63,13 +68,13 @@ import           Diagrams.TwoD.Types import           Diagrams.TwoD.Vector -import           Control.Lens            hiding (at, transform)+import           Control.Lens              hiding (at, transform) import           Data.Semigroup  import           Linear.Affine+import           Linear.Metric import           Linear.V2 import           Linear.Vector-import           Linear.Metric  -- Rotation ------------------------------------------------ 

@@ -1,4 +1,6 @@+{-# LANGUAGE ConstraintKinds       #-} {-# LANGUAGE FlexibleContexts      #-}+{-# LANGUAGE TypeFamilies          #-}   module Diagrams.Test.Transform where

@@ -1,4 +1,6 @@+{-# LANGUAGE ConstraintKinds       #-} {-# LANGUAGE FlexibleContexts      #-}+{-# LANGUAGE TypeFamilies          #-}  module Main where