diagrams-lib 1.4.2 → 1.4.2.1
raw patch · 5 files changed
+21/−11 lines, 5 filesdep ~basedep ~lensdep ~tasty-quickcheckPVP: major bump suggested
API removals or changes: PVP suggests a major version bump
Dependency ranges changed: base, lens, tasty-quickcheck
API changes (from Hackage documentation)
+ Diagrams.Trail: instance (Linear.Metric.Metric v, GHC.Classes.Ord n, GHC.Float.Floating n) => Data.Semigroup.Semigroup (Diagrams.Trail.SegTree v n)
- Diagrams.Segment: oeEnvelope :: forall v_a1dnn n_a1dno. Lens' (OffsetEnvelope v_a1dnn n_a1dno) (Envelope v_a1dnn n_a1dno)
+ Diagrams.Segment: oeEnvelope :: forall v_a1dCg n_a1dCh. Lens' (OffsetEnvelope v_a1dCg n_a1dCh) (Envelope v_a1dCg n_a1dCh)
- Diagrams.Segment: oeOffset :: forall v_a1dnn n_a1dno. Lens' (OffsetEnvelope v_a1dnn n_a1dno) (TotalOffset v_a1dnn n_a1dno)
+ Diagrams.Segment: oeOffset :: forall v_a1dCg n_a1dCh. Lens' (OffsetEnvelope v_a1dCg n_a1dCh) (TotalOffset v_a1dCg n_a1dCh)
- Diagrams.ThreeD.Camera: horizontalFieldOfView :: forall n_aZ7W. Lens' (PerspectiveLens n_aZ7W) (Angle n_aZ7W)
+ Diagrams.ThreeD.Camera: horizontalFieldOfView :: forall n_aZiI. Lens' (PerspectiveLens n_aZiI) (Angle n_aZiI)
- Diagrams.ThreeD.Camera: orthoHeight :: forall n_aZaE. Lens' (OrthoLens n_aZaE) n_aZaE
+ Diagrams.ThreeD.Camera: orthoHeight :: forall n_aZlq. Lens' (OrthoLens n_aZlq) n_aZlq
- Diagrams.ThreeD.Camera: orthoWidth :: forall n_aZaE. Lens' (OrthoLens n_aZaE) n_aZaE
+ Diagrams.ThreeD.Camera: orthoWidth :: forall n_aZlq. Lens' (OrthoLens n_aZlq) n_aZlq
- Diagrams.ThreeD.Camera: verticalFieldOfView :: forall n_aZ7W. Lens' (PerspectiveLens n_aZ7W) (Angle n_aZ7W)
+ Diagrams.ThreeD.Camera: verticalFieldOfView :: forall n_aZiI. Lens' (PerspectiveLens n_aZiI) (Angle n_aZiI)
- Diagrams.Transform.ScaleInv: scaleInvDir :: forall t_aQcd. Lens' (ScaleInv t_aQcd) (Vn t_aQcd)
+ Diagrams.Transform.ScaleInv: scaleInvDir :: forall t_aQmY. Lens' (ScaleInv t_aQmY) (Vn t_aQmY)
- Diagrams.Transform.ScaleInv: scaleInvLoc :: forall t_aQcd. Lens' (ScaleInv t_aQcd) (Point (V t_aQcd) (N t_aQcd))
+ Diagrams.Transform.ScaleInv: scaleInvLoc :: forall t_aQmY. Lens' (ScaleInv t_aQmY) (Point (V t_aQmY) (N t_aQmY))
- Diagrams.Transform.ScaleInv: scaleInvObj :: forall t_aQcd. Lens' (ScaleInv t_aQcd) t_aQcd
+ Diagrams.Transform.ScaleInv: scaleInvObj :: forall t_aQmY. Lens' (ScaleInv t_aQmY) t_aQmY
- Diagrams.TwoD: _LG :: forall n_a2hWx. Prism' (Texture n_a2hWx) (LGradient n_a2hWx)
+ Diagrams.TwoD: _LG :: forall n_a2iho. Prism' (Texture n_a2iho) (LGradient n_a2iho)
- Diagrams.TwoD: _RG :: forall n_a2hWx. Prism' (Texture n_a2hWx) (RGradient n_a2hWx)
+ Diagrams.TwoD: _RG :: forall n_a2iho. Prism' (Texture n_a2iho) (RGradient n_a2iho)
- Diagrams.TwoD: _SC :: forall n_a2hWx. Prism' (Texture n_a2hWx) SomeColor
+ Diagrams.TwoD: _SC :: forall n_a2iho. Prism' (Texture n_a2iho) SomeColor
- Diagrams.TwoD: eColor :: forall n_a2LbZ. Lens' (EnvelopeOpts n_a2LbZ) (Colour Double)
+ Diagrams.TwoD: eColor :: forall n_a2LwQ. Lens' (EnvelopeOpts n_a2LwQ) (Colour Double)
- Diagrams.TwoD: eLineWidth :: forall n_a2LbZ n_a2Lee. Lens (EnvelopeOpts n_a2LbZ) (EnvelopeOpts n_a2Lee) (Measure n_a2LbZ) (Measure n_a2Lee)
+ Diagrams.TwoD: eLineWidth :: forall n_a2LwQ n_a2Lz5. Lens (EnvelopeOpts n_a2LwQ) (EnvelopeOpts n_a2Lz5) (Measure n_a2LwQ) (Measure n_a2Lz5)
- Diagrams.TwoD: ePoints :: forall n_a2LbZ. Lens' (EnvelopeOpts n_a2LbZ) Int
+ Diagrams.TwoD: ePoints :: forall n_a2LwQ. Lens' (EnvelopeOpts n_a2LwQ) Int
- Diagrams.TwoD: oColor :: forall n_a2Lb0. Lens' (OriginOpts n_a2Lb0) (Colour Double)
+ Diagrams.TwoD: oColor :: forall n_a2LvR. Lens' (OriginOpts n_a2LvR) (Colour Double)
- Diagrams.TwoD: oMinSize :: forall n_a2Lb0. Lens' (OriginOpts n_a2Lb0) n_a2Lb0
+ Diagrams.TwoD: oMinSize :: forall n_a2LvR. Lens' (OriginOpts n_a2LvR) n_a2LvR
- Diagrams.TwoD: oScale :: forall n_a2Lb0. Lens' (OriginOpts n_a2Lb0) n_a2Lb0
+ Diagrams.TwoD: oScale :: forall n_a2LvR. Lens' (OriginOpts n_a2LvR) n_a2LvR
- Diagrams.TwoD: radiusBL :: forall d_a1YAb. Lens' (RoundedRectOpts d_a1YAb) d_a1YAb
+ Diagrams.TwoD: radiusBL :: forall d_a1YWd. Lens' (RoundedRectOpts d_a1YWd) d_a1YWd
- Diagrams.TwoD: radiusBR :: forall d_a1YAb. Lens' (RoundedRectOpts d_a1YAb) d_a1YAb
+ Diagrams.TwoD: radiusBR :: forall d_a1YWd. Lens' (RoundedRectOpts d_a1YWd) d_a1YWd
- Diagrams.TwoD: radiusTL :: forall d_a1YAb. Lens' (RoundedRectOpts d_a1YAb) d_a1YAb
+ Diagrams.TwoD: radiusTL :: forall d_a1YWd. Lens' (RoundedRectOpts d_a1YWd) d_a1YWd
- Diagrams.TwoD: radiusTR :: forall d_a1YAb. Lens' (RoundedRectOpts d_a1YAb) d_a1YAb
+ Diagrams.TwoD: radiusTR :: forall d_a1YWd. Lens' (RoundedRectOpts d_a1YWd) d_a1YWd
- Diagrams.TwoD: tColor :: forall n_a2LeD. Lens' (TraceOpts n_a2LeD) (Colour Double)
+ Diagrams.TwoD: tColor :: forall n_a2Lzu. Lens' (TraceOpts n_a2Lzu) (Colour Double)
- Diagrams.TwoD: tMinSize :: forall n_a2LeD. Lens' (TraceOpts n_a2LeD) n_a2LeD
+ Diagrams.TwoD: tMinSize :: forall n_a2Lzu. Lens' (TraceOpts n_a2Lzu) n_a2Lzu
- Diagrams.TwoD: tPoints :: forall n_a2LeD. Lens' (TraceOpts n_a2LeD) Int
+ Diagrams.TwoD: tPoints :: forall n_a2Lzu. Lens' (TraceOpts n_a2Lzu) Int
- Diagrams.TwoD: tScale :: forall n_a2LeD. Lens' (TraceOpts n_a2LeD) n_a2LeD
+ Diagrams.TwoD: tScale :: forall n_a2Lzu. Lens' (TraceOpts n_a2Lzu) n_a2Lzu
- Diagrams.TwoD.Attributes: _LG :: forall n_a2hWx. Prism' (Texture n_a2hWx) (LGradient n_a2hWx)
+ Diagrams.TwoD.Attributes: _LG :: forall n_a2iho. Prism' (Texture n_a2iho) (LGradient n_a2iho)
- Diagrams.TwoD.Attributes: _RG :: forall n_a2hWx. Prism' (Texture n_a2hWx) (RGradient n_a2hWx)
+ Diagrams.TwoD.Attributes: _RG :: forall n_a2iho. Prism' (Texture n_a2iho) (RGradient n_a2iho)
- Diagrams.TwoD.Attributes: _SC :: forall n_a2hWx. Prism' (Texture n_a2hWx) SomeColor
+ Diagrams.TwoD.Attributes: _SC :: forall n_a2iho. Prism' (Texture n_a2iho) SomeColor
- Diagrams.TwoD.Model: eColor :: forall n_a2LbZ. Lens' (EnvelopeOpts n_a2LbZ) (Colour Double)
+ Diagrams.TwoD.Model: eColor :: forall n_a2LwQ. Lens' (EnvelopeOpts n_a2LwQ) (Colour Double)
- Diagrams.TwoD.Model: eLineWidth :: forall n_a2LbZ n_a2Lee. Lens (EnvelopeOpts n_a2LbZ) (EnvelopeOpts n_a2Lee) (Measure n_a2LbZ) (Measure n_a2Lee)
+ Diagrams.TwoD.Model: eLineWidth :: forall n_a2LwQ n_a2Lz5. Lens (EnvelopeOpts n_a2LwQ) (EnvelopeOpts n_a2Lz5) (Measure n_a2LwQ) (Measure n_a2Lz5)
- Diagrams.TwoD.Model: ePoints :: forall n_a2LbZ. Lens' (EnvelopeOpts n_a2LbZ) Int
+ Diagrams.TwoD.Model: ePoints :: forall n_a2LwQ. Lens' (EnvelopeOpts n_a2LwQ) Int
- Diagrams.TwoD.Model: oColor :: forall n_a2Lb0. Lens' (OriginOpts n_a2Lb0) (Colour Double)
+ Diagrams.TwoD.Model: oColor :: forall n_a2LvR. Lens' (OriginOpts n_a2LvR) (Colour Double)
- Diagrams.TwoD.Model: oMinSize :: forall n_a2Lb0. Lens' (OriginOpts n_a2Lb0) n_a2Lb0
+ Diagrams.TwoD.Model: oMinSize :: forall n_a2LvR. Lens' (OriginOpts n_a2LvR) n_a2LvR
- Diagrams.TwoD.Model: oScale :: forall n_a2Lb0. Lens' (OriginOpts n_a2Lb0) n_a2Lb0
+ Diagrams.TwoD.Model: oScale :: forall n_a2LvR. Lens' (OriginOpts n_a2LvR) n_a2LvR
- Diagrams.TwoD.Model: tColor :: forall n_a2LeD. Lens' (TraceOpts n_a2LeD) (Colour Double)
+ Diagrams.TwoD.Model: tColor :: forall n_a2Lzu. Lens' (TraceOpts n_a2Lzu) (Colour Double)
- Diagrams.TwoD.Model: tMinSize :: forall n_a2LeD. Lens' (TraceOpts n_a2LeD) n_a2LeD
+ Diagrams.TwoD.Model: tMinSize :: forall n_a2Lzu. Lens' (TraceOpts n_a2Lzu) n_a2Lzu
- Diagrams.TwoD.Model: tPoints :: forall n_a2LeD. Lens' (TraceOpts n_a2LeD) Int
+ Diagrams.TwoD.Model: tPoints :: forall n_a2Lzu. Lens' (TraceOpts n_a2Lzu) Int
- Diagrams.TwoD.Model: tScale :: forall n_a2LeD. Lens' (TraceOpts n_a2LeD) n_a2LeD
+ Diagrams.TwoD.Model: tScale :: forall n_a2Lzu. Lens' (TraceOpts n_a2Lzu) n_a2Lzu
- Diagrams.TwoD.Shapes: radiusBL :: forall d_a1YAb. Lens' (RoundedRectOpts d_a1YAb) d_a1YAb
+ Diagrams.TwoD.Shapes: radiusBL :: forall d_a1YWd. Lens' (RoundedRectOpts d_a1YWd) d_a1YWd
- Diagrams.TwoD.Shapes: radiusBR :: forall d_a1YAb. Lens' (RoundedRectOpts d_a1YAb) d_a1YAb
+ Diagrams.TwoD.Shapes: radiusBR :: forall d_a1YWd. Lens' (RoundedRectOpts d_a1YWd) d_a1YWd
- Diagrams.TwoD.Shapes: radiusTL :: forall d_a1YAb. Lens' (RoundedRectOpts d_a1YAb) d_a1YAb
+ Diagrams.TwoD.Shapes: radiusTL :: forall d_a1YWd. Lens' (RoundedRectOpts d_a1YWd) d_a1YWd
- Diagrams.TwoD.Shapes: radiusTR :: forall d_a1YAb. Lens' (RoundedRectOpts d_a1YAb) d_a1YAb
+ Diagrams.TwoD.Shapes: radiusTR :: forall d_a1YWd. Lens' (RoundedRectOpts d_a1YWd) d_a1YWd
Files
- CHANGELOG.md +10/−0
- diagrams-lib.cabal +7/−7
- src/Diagrams/Animation.hs +1/−1
- src/Diagrams/Trail.hs +1/−1
- src/Diagrams/TwoD/Offset.hs +2/−2
CHANGELOG.md view
@@ -1,3 +1,13 @@+## [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)+- Allow `tasty-quickcheck-0.10`+- Bug fix for `Diagrams.TwoD.Offset.capArc` ([#310](https://github.com/diagrams/diagrams-lib/pull/310))++## [v1.4.2-r1](https://github.com/diagrams/diagrams-lib/tree/v1.4.2-r1) (2017-12-20)++Hackage revision to allow `tasty-1.0` in the test suite.+ ## [v1.4.2](https://github.com/diagrams/diagrams-lib/tree/v1.4.2) (2017-12-20) - New functions:
diagrams-lib.cabal view
@@ -1,5 +1,5 @@ Name: diagrams-lib-Version: 1.4.2+Version: 1.4.2.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@@ -18,10 +18,10 @@ Bug-reports: http://github.com/diagrams/diagrams-lib/issues Category: Graphics Build-type: Simple-Cabal-version: >=1.18+Cabal-version: 1.18 Extra-source-files: CHANGELOG.md, README.markdown, diagrams/*.svg Extra-doc-files: diagrams/*.svg-Tested-with: GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.2, GHC == 8.0.1, GHC == 8.2.2+Tested-with: GHC == 7.8.4, GHC == 7.10.2, GHC == 8.0.1, GHC == 8.2.2, GHC == 8.4.1 Source-repository head type: git location: http://github.com/diagrams/diagrams-lib.git@@ -100,7 +100,7 @@ Diagrams.TwoD.Types, Diagrams.TwoD.Vector, Diagrams.Util- Build-depends: base >= 4.6 && < 4.11,+ Build-depends: base >= 4.6 && < 4.12, containers >= 0.3 && < 0.6, array >= 0.3 && < 0.6, semigroups >= 0.3.4 && < 0.19,@@ -113,7 +113,7 @@ data-default-class < 0.2, fingertree >= 0.1 && < 0.2, intervals >= 0.7 && < 0.9,- lens >= 4.6 && < 4.16,+ lens >= 4.6 && < 4.17, tagged >= 0.7, optparse-applicative >= 0.11 && < 0.15, filepath,@@ -158,9 +158,9 @@ , Instances hs-source-dirs: test build-depends: base,- tasty >= 0.10 && < 0.13,+ tasty >= 0.10 && < 1.1, tasty-hunit >= 0.9.2 && < 0.11,- tasty-quickcheck >= 0.8 && < 0.10,+ tasty-quickcheck >= 0.8 && < 0.11, deepseq >= 1.3 && < 1.5, diagrams-lib, lens,
src/Diagrams/Animation.hs view
@@ -50,7 +50,7 @@ -- | A value of type @QAnimation b v m@ is an animation (a -- time-varying diagram with start and end times) that can be--- rendered by backspace @b@, with vector space @v@ and monoidal+-- rendered by backend @b@, with vector space @v@ and monoidal -- annotations of type @m@. type QAnimation b v n m = Active (QDiagram b v n m)
src/Diagrams/Trail.hs view
@@ -174,7 +174,7 @@ -- 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, Transformable, FT.Measured (SegMeasure v n))+ deriving (Eq, Ord, Show, Monoid, Semigroup, Transformable, FT.Measured (SegMeasure v n)) instance Wrapped (SegTree v n) where type Unwrapped (SegTree v n) = FingerTree (SegMeasure v n) (Segment Closed v n)
src/Diagrams/TwoD/Offset.hs view
@@ -470,8 +470,8 @@ capArc :: RealFloat n => n -> Point V2 n -> Point V2 n -> Point V2 n -> Trail V2 n capArc r c a b = trailLike . moveTo c $ fs where- fs | r < 0 = scale (-r) $ arcCW (dirBetween a c) (dirBetween b c)- | otherwise = scale r $ arcCCW (dirBetween a c) (dirBetween b c)+ fs | r < 0 = scale (-r) $ arcCW (dirBetween c a) (dirBetween c b)+ | otherwise = scale r $ arcCCW (dirBetween c a) (dirBetween c b) -- | Join together a list of located trails with the given join style. The -- style is given as a function to compute the join given the local information