diagrams-lib 1.4 → 1.4.0.1
raw patch · 3 files changed
+54/−1 lines, 3 filesdep ~directoryPVP: major bump suggested
API removals or changes: PVP suggests a major version bump
Dependency ranges changed: directory
API changes (from Hackage documentation)
- Diagrams.Coordinates: instance (GHC.Classes.Eq b, GHC.Classes.Eq a) => GHC.Classes.Eq (a Diagrams.Coordinates.:& b)
- Diagrams.Coordinates: instance (GHC.Classes.Ord b, GHC.Classes.Ord a) => GHC.Classes.Ord (a Diagrams.Coordinates.:& b)
- Diagrams.Coordinates: instance (GHC.Show.Show b, GHC.Show.Show a) => GHC.Show.Show (a Diagrams.Coordinates.:& b)
- Diagrams.Trail: instance (Linear.Metric.Metric v, GHC.Classes.Ord n, GHC.Float.Floating n) => Data.FingerTree.Measured (Diagrams.Segment.SegMeasure v n) (Diagrams.Trail.SegTree v n)
- Diagrams.Trail: instance (Linear.Metric.Metric v, GHC.Classes.Ord n, GHC.Float.Floating n) => Diagrams.Core.Transform.Transformable (Diagrams.Trail.SegTree v n)
- Diagrams.Trail: instance (Linear.Metric.Metric v, GHC.Classes.Ord n, GHC.Float.Floating n) => GHC.Base.Monoid (Diagrams.Trail.SegTree v n)
+ Diagrams.Coordinates: instance (GHC.Classes.Eq a, GHC.Classes.Eq b) => GHC.Classes.Eq (a Diagrams.Coordinates.:& b)
+ Diagrams.Coordinates: instance (GHC.Classes.Ord a, GHC.Classes.Ord b) => GHC.Classes.Ord (a Diagrams.Coordinates.:& b)
+ Diagrams.Coordinates: instance (GHC.Show.Show a, GHC.Show.Show b) => GHC.Show.Show (a Diagrams.Coordinates.:& b)
+ Diagrams.Trail: instance (GHC.Float.Floating n, GHC.Classes.Ord n, Linear.Metric.Metric v) => Data.FingerTree.Measured (Diagrams.Segment.SegMeasure v n) (Diagrams.Trail.SegTree v n)
+ Diagrams.Trail: instance (GHC.Float.Floating n, GHC.Classes.Ord n, Linear.Metric.Metric v) => Diagrams.Core.Transform.Transformable (Diagrams.Trail.SegTree v n)
+ Diagrams.Trail: instance (GHC.Float.Floating n, GHC.Classes.Ord n, Linear.Metric.Metric v) => GHC.Base.Monoid (Diagrams.Trail.SegTree v n)
- Diagrams.Names: (.>>) :: (Qualifiable q, IsName a) => a -> q -> q
+ Diagrams.Names: (.>>) :: IsName a => a -> q -> q
- Diagrams.Names: toName :: IsName a => a -> Name
+ Diagrams.Names: toName :: a -> Name
- Diagrams.Prelude: (<*>) :: Applicative f => f (a -> b) -> f a -> f b
+ Diagrams.Prelude: (<*>) :: f (a -> b) -> f a -> f b
- Diagrams.Prelude: pure :: Applicative f => a -> f a
+ Diagrams.Prelude: pure :: a -> f a
- Diagrams.Segment: oeEnvelope :: forall v_a1aVu n_a1aVv. Lens' (OffsetEnvelope v_a1aVu n_a1aVv) (Envelope v_a1aVu n_a1aVv)
+ Diagrams.Segment: oeEnvelope :: forall v_a1BZv n_a1BZw. Lens' (OffsetEnvelope v_a1BZv n_a1BZw) (Envelope v_a1BZv n_a1BZw)
- Diagrams.Segment: oeOffset :: forall v_a1aVu n_a1aVv. Lens' (OffsetEnvelope v_a1aVu n_a1aVv) (TotalOffset v_a1aVu n_a1aVv)
+ Diagrams.Segment: oeOffset :: forall v_a1BZv n_a1BZw. Lens' (OffsetEnvelope v_a1BZv n_a1BZw) (TotalOffset v_a1BZv n_a1BZw)
- Diagrams.ThreeD.Camera: horizontalFieldOfView :: forall n_aOEO. Lens' (PerspectiveLens n_aOEO) (Angle n_aOEO)
+ Diagrams.ThreeD.Camera: horizontalFieldOfView :: forall n_aWgn. Lens' (PerspectiveLens n_aWgn) (Angle n_aWgn)
- Diagrams.ThreeD.Camera: orthoHeight :: forall n_aOH2. Lens' (OrthoLens n_aOH2) n_aOH2
+ Diagrams.ThreeD.Camera: orthoHeight :: forall n_aWiB. Lens' (OrthoLens n_aWiB) n_aWiB
- Diagrams.ThreeD.Camera: orthoWidth :: forall n_aOH2. Lens' (OrthoLens n_aOH2) n_aOH2
+ Diagrams.ThreeD.Camera: orthoWidth :: forall n_aWiB. Lens' (OrthoLens n_aWiB) n_aWiB
- Diagrams.ThreeD.Camera: verticalFieldOfView :: forall n_aOEO. Lens' (PerspectiveLens n_aOEO) (Angle n_aOEO)
+ Diagrams.ThreeD.Camera: verticalFieldOfView :: forall n_aWgn. Lens' (PerspectiveLens n_aWgn) (Angle n_aWgn)
- Diagrams.ThreeD.Types: _x :: (R1 t, Functor f) => (a -> f a) -> t a -> f (t a)
+ Diagrams.ThreeD.Types: _x :: Functor f => (a -> f a) -> t a -> f (t a)
- Diagrams.ThreeD.Types: _xy :: (R2 t, Functor f) => (V2 a -> f (V2 a)) -> t a -> f (t a)
+ Diagrams.ThreeD.Types: _xy :: Functor f => (V2 a -> f (V2 a)) -> t a -> f (t a)
- Diagrams.ThreeD.Types: _xyz :: (R3 t, Functor f) => (V3 a -> f (V3 a)) -> t a -> f (t a)
+ Diagrams.ThreeD.Types: _xyz :: Functor f => (V3 a -> f (V3 a)) -> t a -> f (t a)
- Diagrams.ThreeD.Types: _y :: (R2 t, Functor f) => (a -> f a) -> t a -> f (t a)
+ Diagrams.ThreeD.Types: _y :: Functor f => (a -> f a) -> t a -> f (t a)
- Diagrams.ThreeD.Types: _z :: (R3 t, Functor f) => (a -> f a) -> t a -> f (t a)
+ Diagrams.ThreeD.Types: _z :: Functor f => (a -> f a) -> t a -> f (t a)
- Diagrams.Transform: moveOriginTo :: HasOrigin t => Point (V t) (N t) -> t -> t
+ Diagrams.Transform: moveOriginTo :: Point (V t) (N t) -> t -> t
- Diagrams.Transform: transform :: Transformable t => Transformation (V t) (N t) -> t -> t
+ Diagrams.Transform: transform :: Transformation (V t) (N t) -> t -> t
- Diagrams.Transform.ScaleInv: scaleInvDir :: forall t_a120H. Lens' (ScaleInv t_a120H) (Vn t_a120H)
+ Diagrams.Transform.ScaleInv: scaleInvDir :: forall t_a1hxs. Lens' (ScaleInv t_a1hxs) (Vn t_a1hxs)
- Diagrams.Transform.ScaleInv: scaleInvLoc :: forall t_a120H. Lens' (ScaleInv t_a120H) (Point (V t_a120H) (N t_a120H))
+ Diagrams.Transform.ScaleInv: scaleInvLoc :: forall t_a1hxs. Lens' (ScaleInv t_a1hxs) (Point (V t_a1hxs) (N t_a1hxs))
- Diagrams.Transform.ScaleInv: scaleInvObj :: forall t_a120H. Lens' (ScaleInv t_a120H) t_a120H
+ Diagrams.Transform.ScaleInv: scaleInvObj :: forall t_a1hxs. Lens' (ScaleInv t_a1hxs) t_a1hxs
- Diagrams.TwoD: _LG :: forall n_a255A. Prism' (Texture n_a255A) (LGradient n_a255A)
+ Diagrams.TwoD: _LG :: forall n_a4lW8. Prism' (Texture n_a4lW8) (LGradient n_a4lW8)
- Diagrams.TwoD: _RG :: forall n_a255A. Prism' (Texture n_a255A) (RGradient n_a255A)
+ Diagrams.TwoD: _RG :: forall n_a4lW8. Prism' (Texture n_a4lW8) (RGradient n_a4lW8)
- Diagrams.TwoD: _SC :: forall n_a255A. Prism' (Texture n_a255A) SomeColor
+ Diagrams.TwoD: _SC :: forall n_a4lW8. Prism' (Texture n_a4lW8) SomeColor
- Diagrams.TwoD: _x :: (R1 t, Functor f) => (a -> f a) -> t a -> f (t a)
+ Diagrams.TwoD: _x :: Functor f => (a -> f a) -> t a -> f (t a)
- Diagrams.TwoD: _xy :: (R2 t, Functor f) => (V2 a -> f (V2 a)) -> t a -> f (t a)
+ Diagrams.TwoD: _xy :: Functor f => (V2 a -> f (V2 a)) -> t a -> f (t a)
- Diagrams.TwoD: _y :: (R2 t, Functor f) => (a -> f a) -> t a -> f (t a)
+ Diagrams.TwoD: _y :: Functor f => (a -> f a) -> t a -> f (t a)
- Diagrams.TwoD: eColor :: forall n_a2jLE. Lens' (EnvelopeOpts n_a2jLE) (Colour Double)
+ Diagrams.TwoD: eColor :: forall n_a4WCn. Lens' (EnvelopeOpts n_a4WCn) (Colour Double)
- Diagrams.TwoD: eLineWidth :: forall n_a2jLE n_a2jND. Lens (EnvelopeOpts n_a2jLE) (EnvelopeOpts n_a2jND) (Measure n_a2jLE) (Measure n_a2jND)
+ Diagrams.TwoD: eLineWidth :: forall n_a4WCn n_a4WEn. Lens (EnvelopeOpts n_a4WCn) (EnvelopeOpts n_a4WEn) (Measure n_a4WCn) (Measure n_a4WEn)
- Diagrams.TwoD: ePoints :: forall n_a2jLE. Lens' (EnvelopeOpts n_a2jLE) Int
+ Diagrams.TwoD: ePoints :: forall n_a4WCn. Lens' (EnvelopeOpts n_a4WCn) Int
- Diagrams.TwoD: oColor :: forall n_a2jKL. Lens' (OriginOpts n_a2jKL) (Colour Double)
+ Diagrams.TwoD: oColor :: forall n_a4WBu. Lens' (OriginOpts n_a4WBu) (Colour Double)
- Diagrams.TwoD: oMinSize :: forall n_a2jKL. Lens' (OriginOpts n_a2jKL) n_a2jKL
+ Diagrams.TwoD: oMinSize :: forall n_a4WBu. Lens' (OriginOpts n_a4WBu) n_a4WBu
- Diagrams.TwoD: oScale :: forall n_a2jKL. Lens' (OriginOpts n_a2jKL) n_a2jKL
+ Diagrams.TwoD: oScale :: forall n_a4WBu. Lens' (OriginOpts n_a4WBu) n_a4WBu
- Diagrams.TwoD: radiusBL :: forall d_a2xSp. Lens' (RoundedRectOpts d_a2xSp) d_a2xSp
+ Diagrams.TwoD: radiusBL :: forall d_a3ljq. Lens' (RoundedRectOpts d_a3ljq) d_a3ljq
- Diagrams.TwoD: radiusBR :: forall d_a2xSp. Lens' (RoundedRectOpts d_a2xSp) d_a2xSp
+ Diagrams.TwoD: radiusBR :: forall d_a3ljq. Lens' (RoundedRectOpts d_a3ljq) d_a3ljq
- Diagrams.TwoD: radiusTL :: forall d_a2xSp. Lens' (RoundedRectOpts d_a2xSp) d_a2xSp
+ Diagrams.TwoD: radiusTL :: forall d_a3ljq. Lens' (RoundedRectOpts d_a3ljq) d_a3ljq
- Diagrams.TwoD: radiusTR :: forall d_a2xSp. Lens' (RoundedRectOpts d_a2xSp) d_a2xSp
+ Diagrams.TwoD: radiusTR :: forall d_a3ljq. Lens' (RoundedRectOpts d_a3ljq) d_a3ljq
- Diagrams.TwoD: tColor :: forall n_a2jO2. Lens' (TraceOpts n_a2jO2) (Colour Double)
+ Diagrams.TwoD: tColor :: forall n_a4WEM. Lens' (TraceOpts n_a4WEM) (Colour Double)
- Diagrams.TwoD: tMinSize :: forall n_a2jO2. Lens' (TraceOpts n_a2jO2) n_a2jO2
+ Diagrams.TwoD: tMinSize :: forall n_a4WEM. Lens' (TraceOpts n_a4WEM) n_a4WEM
- Diagrams.TwoD: tPoints :: forall n_a2jO2. Lens' (TraceOpts n_a2jO2) Int
+ Diagrams.TwoD: tPoints :: forall n_a4WEM. Lens' (TraceOpts n_a4WEM) Int
- Diagrams.TwoD: tScale :: forall n_a2jO2. Lens' (TraceOpts n_a2jO2) n_a2jO2
+ Diagrams.TwoD: tScale :: forall n_a4WEM. Lens' (TraceOpts n_a4WEM) n_a4WEM
- Diagrams.TwoD.Attributes: _LG :: forall n_a255A. Prism' (Texture n_a255A) (LGradient n_a255A)
+ Diagrams.TwoD.Attributes: _LG :: forall n_a4lW8. Prism' (Texture n_a4lW8) (LGradient n_a4lW8)
- Diagrams.TwoD.Attributes: _RG :: forall n_a255A. Prism' (Texture n_a255A) (RGradient n_a255A)
+ Diagrams.TwoD.Attributes: _RG :: forall n_a4lW8. Prism' (Texture n_a4lW8) (RGradient n_a4lW8)
- Diagrams.TwoD.Attributes: _SC :: forall n_a255A. Prism' (Texture n_a255A) SomeColor
+ Diagrams.TwoD.Attributes: _SC :: forall n_a4lW8. Prism' (Texture n_a4lW8) SomeColor
- Diagrams.TwoD.Model: eColor :: forall n_a2jLE. Lens' (EnvelopeOpts n_a2jLE) (Colour Double)
+ Diagrams.TwoD.Model: eColor :: forall n_a4WCn. Lens' (EnvelopeOpts n_a4WCn) (Colour Double)
- Diagrams.TwoD.Model: eLineWidth :: forall n_a2jLE n_a2jND. Lens (EnvelopeOpts n_a2jLE) (EnvelopeOpts n_a2jND) (Measure n_a2jLE) (Measure n_a2jND)
+ Diagrams.TwoD.Model: eLineWidth :: forall n_a4WCn n_a4WEn. Lens (EnvelopeOpts n_a4WCn) (EnvelopeOpts n_a4WEn) (Measure n_a4WCn) (Measure n_a4WEn)
- Diagrams.TwoD.Model: ePoints :: forall n_a2jLE. Lens' (EnvelopeOpts n_a2jLE) Int
+ Diagrams.TwoD.Model: ePoints :: forall n_a4WCn. Lens' (EnvelopeOpts n_a4WCn) Int
- Diagrams.TwoD.Model: oColor :: forall n_a2jKL. Lens' (OriginOpts n_a2jKL) (Colour Double)
+ Diagrams.TwoD.Model: oColor :: forall n_a4WBu. Lens' (OriginOpts n_a4WBu) (Colour Double)
- Diagrams.TwoD.Model: oMinSize :: forall n_a2jKL. Lens' (OriginOpts n_a2jKL) n_a2jKL
+ Diagrams.TwoD.Model: oMinSize :: forall n_a4WBu. Lens' (OriginOpts n_a4WBu) n_a4WBu
- Diagrams.TwoD.Model: oScale :: forall n_a2jKL. Lens' (OriginOpts n_a2jKL) n_a2jKL
+ Diagrams.TwoD.Model: oScale :: forall n_a4WBu. Lens' (OriginOpts n_a4WBu) n_a4WBu
- Diagrams.TwoD.Model: tColor :: forall n_a2jO2. Lens' (TraceOpts n_a2jO2) (Colour Double)
+ Diagrams.TwoD.Model: tColor :: forall n_a4WEM. Lens' (TraceOpts n_a4WEM) (Colour Double)
- Diagrams.TwoD.Model: tMinSize :: forall n_a2jO2. Lens' (TraceOpts n_a2jO2) n_a2jO2
+ Diagrams.TwoD.Model: tMinSize :: forall n_a4WEM. Lens' (TraceOpts n_a4WEM) n_a4WEM
- Diagrams.TwoD.Model: tPoints :: forall n_a2jO2. Lens' (TraceOpts n_a2jO2) Int
+ Diagrams.TwoD.Model: tPoints :: forall n_a4WEM. Lens' (TraceOpts n_a4WEM) Int
- Diagrams.TwoD.Model: tScale :: forall n_a2jO2. Lens' (TraceOpts n_a2jO2) n_a2jO2
+ Diagrams.TwoD.Model: tScale :: forall n_a4WEM. Lens' (TraceOpts n_a4WEM) n_a4WEM
- Diagrams.TwoD.Shapes: radiusBL :: forall d_a2xSp. Lens' (RoundedRectOpts d_a2xSp) d_a2xSp
+ Diagrams.TwoD.Shapes: radiusBL :: forall d_a3ljq. Lens' (RoundedRectOpts d_a3ljq) d_a3ljq
- Diagrams.TwoD.Shapes: radiusBR :: forall d_a2xSp. Lens' (RoundedRectOpts d_a2xSp) d_a2xSp
+ Diagrams.TwoD.Shapes: radiusBR :: forall d_a3ljq. Lens' (RoundedRectOpts d_a3ljq) d_a3ljq
- Diagrams.TwoD.Shapes: radiusTL :: forall d_a2xSp. Lens' (RoundedRectOpts d_a2xSp) d_a2xSp
+ Diagrams.TwoD.Shapes: radiusTL :: forall d_a3ljq. Lens' (RoundedRectOpts d_a3ljq) d_a3ljq
- Diagrams.TwoD.Shapes: radiusTR :: forall d_a2xSp. Lens' (RoundedRectOpts d_a2xSp) d_a2xSp
+ Diagrams.TwoD.Shapes: radiusTR :: forall d_a3ljq. Lens' (RoundedRectOpts d_a3ljq) d_a3ljq
- Diagrams.TwoD.Types: _x :: (R1 t, Functor f) => (a -> f a) -> t a -> f (t a)
+ Diagrams.TwoD.Types: _x :: Functor f => (a -> f a) -> t a -> f (t a)
- Diagrams.TwoD.Types: _xy :: (R2 t, Functor f) => (V2 a -> f (V2 a)) -> t a -> f (t a)
+ Diagrams.TwoD.Types: _xy :: Functor f => (V2 a -> f (V2 a)) -> t a -> f (t a)
- Diagrams.TwoD.Types: _y :: (R2 t, Functor f) => (a -> f a) -> t a -> f (t a)
+ Diagrams.TwoD.Types: _y :: Functor f => (a -> f a) -> t a -> f (t a)
Files
- CHANGELOG.md +4/−0
- diagrams-lib.cabal +2/−1
- test/Diagrams/Test/Trail.hs +48/−0
CHANGELOG.md view
@@ -1,3 +1,7 @@+## [v1.4.0.1](https://github.com/diagrams/diagrams-lib/tree/v1.4.0.1) (2016-11-07)++- Fix test suite compilation problem ([#286](https://github.com/diagrams/diagrams-lib/issues/286))+ ## [v1.4](https://github.com/diagrams/diagrams-lib/tree/v1.4) (2016-10-26) * **New features**
diagrams-lib.cabal view
@@ -1,5 +1,5 @@ Name: diagrams-lib-Version: 1.4+Version: 1.4.0.1 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@@ -148,6 +148,7 @@ type: exitcode-stdio-1.0 main-is: Test.hs other-modules: Diagrams.Test.Direction+ , Diagrams.Test.Trail , Diagrams.Test.Transform , Diagrams.Test.TwoD.Offset , Diagrams.Test.TwoD
+ test/Diagrams/Test/Trail.hs view
@@ -0,0 +1,48 @@+{-# LANGUAGE FlexibleContexts #-}+++module Diagrams.Test.Trail where++import Diagrams.Prelude+import Instances+import Test.Tasty+import Test.Tasty.QuickCheck++tests :: TestTree+tests = testGroup "Trail"+ [ let wrap :: Trail' Line V2 Double -> Located (Trail V2 Double)+ wrap = (`at` origin) . wrapLine+ in+ testProperty "unfixTrail . fixTrail == id for lines" $+ \l -> (unfixTrail . fixTrail $ wrap l) =~ (wrap l)++ , testProperty "glueLine . cutLoop == id" $+ \loop -> (glueLine . cutLoop $ loop) =~ (loop :: Trail' Loop V2 Double)++ , testProperty "trailOffset == sumV . trailOffsets" $+ \t -> trailOffset t =~ (sumV . trailOffsets $ (t :: Trail V2 Double))++ , testProperty "reverseTrail . reverseTrail == id" $+ \t -> (reverseTrail . reverseTrail $ t) =~ (t :: Trail V2 Double)++ , testProperty "reverseLocTrail . reverseLocTrail == id" $+ \t -> (reverseLocTrail . reverseLocTrail $ t) =~+ (t :: Located (Trail V2 Double))++ , testProperty "reverseLine . reverseLine == id" $+ \t -> (reverseLine . reverseLine $ t) =~+ (t :: Trail' Line V2 Double)++ , testProperty "reverseLocLine . reverseLocLine == id" $+ \t -> (reverseLocLine . reverseLocLine $ t) =~+ (t :: Located (Trail' Line V2 Double))++ , testProperty "reverseLoop . reverseLoop == id" $+ \t -> (reverseLoop . reverseLoop $ t) =~+ (t :: Trail' Loop V2 Double)++ , testProperty "reverseLocLoop . reverseLocLoop == id" $+ \t -> (reverseLocLoop . reverseLocLoop $ t) =~+ (t :: Located (Trail' Loop V2 Double))++ ]