diagrams-lib 1.4.2.2 → 1.4.2.3
raw patch · 3 files changed
+11/−7 lines, 3 filesdep ~JuicyPixelsdep ~basedep ~containersPVP: major bump suggested
API removals or changes: PVP suggests a major version bump
Dependency ranges changed: JuicyPixels, base, containers, lens, tasty
API changes (from Hackage documentation)
- Diagrams.Segment: oeEnvelope :: forall v_a1dF5 n_a1dF6. Lens' (OffsetEnvelope v_a1dF5 n_a1dF6) (Envelope v_a1dF5 n_a1dF6)
+ Diagrams.Segment: oeEnvelope :: forall v_a1e5C n_a1e5D. Lens' (OffsetEnvelope v_a1e5C n_a1e5D) (Envelope v_a1e5C n_a1e5D)
- Diagrams.Segment: oeOffset :: forall v_a1dF5 n_a1dF6. Lens' (OffsetEnvelope v_a1dF5 n_a1dF6) (TotalOffset v_a1dF5 n_a1dF6)
+ Diagrams.Segment: oeOffset :: forall v_a1e5C n_a1e5D. Lens' (OffsetEnvelope v_a1e5C n_a1e5D) (TotalOffset v_a1e5C n_a1e5D)
- Diagrams.ThreeD.Camera: horizontalFieldOfView :: forall n_aZlc. Lens' (PerspectiveLens n_aZlc) (Angle n_aZlc)
+ Diagrams.ThreeD.Camera: horizontalFieldOfView :: forall n_aZLQ. Lens' (PerspectiveLens n_aZLQ) (Angle n_aZLQ)
- Diagrams.ThreeD.Camera: orthoHeight :: forall n_aZnU. Lens' (OrthoLens n_aZnU) n_aZnU
+ Diagrams.ThreeD.Camera: orthoHeight :: forall n_aZOy. Lens' (OrthoLens n_aZOy) n_aZOy
- Diagrams.ThreeD.Camera: orthoWidth :: forall n_aZnU. Lens' (OrthoLens n_aZnU) n_aZnU
+ Diagrams.ThreeD.Camera: orthoWidth :: forall n_aZOy. Lens' (OrthoLens n_aZOy) n_aZOy
- Diagrams.ThreeD.Camera: verticalFieldOfView :: forall n_aZlc. Lens' (PerspectiveLens n_aZlc) (Angle n_aZlc)
+ Diagrams.ThreeD.Camera: verticalFieldOfView :: forall n_aZLQ. Lens' (PerspectiveLens n_aZLQ) (Angle n_aZLQ)
- Diagrams.Transform.ScaleInv: scaleInvDir :: forall t_aQpv. Lens' (ScaleInv t_aQpv) (Vn t_aQpv)
+ Diagrams.Transform.ScaleInv: scaleInvDir :: forall t_aQQ9. Lens' (ScaleInv t_aQQ9) (Vn t_aQQ9)
- Diagrams.Transform.ScaleInv: scaleInvLoc :: forall t_aQpv. Lens' (ScaleInv t_aQpv) (Point (V t_aQpv) (N t_aQpv))
+ Diagrams.Transform.ScaleInv: scaleInvLoc :: forall t_aQQ9. Lens' (ScaleInv t_aQQ9) (Point (V t_aQQ9) (N t_aQQ9))
- Diagrams.Transform.ScaleInv: scaleInvObj :: forall t_aQpv. Lens' (ScaleInv t_aQpv) t_aQpv
+ Diagrams.Transform.ScaleInv: scaleInvObj :: forall t_aQQ9. Lens' (ScaleInv t_aQQ9) t_aQQ9
- Diagrams.TwoD: _LG :: forall n_a2ijv. Prism' (Texture n_a2ijv) (LGradient n_a2ijv)
+ Diagrams.TwoD: _LG :: forall n_a2iJx. Prism' (Texture n_a2iJx) (LGradient n_a2iJx)
- Diagrams.TwoD: _RG :: forall n_a2ijv. Prism' (Texture n_a2ijv) (RGradient n_a2ijv)
+ Diagrams.TwoD: _RG :: forall n_a2iJx. Prism' (Texture n_a2iJx) (RGradient n_a2iJx)
- Diagrams.TwoD: _SC :: forall n_a2ijv. Prism' (Texture n_a2ijv) SomeColor
+ Diagrams.TwoD: _SC :: forall n_a2iJx. Prism' (Texture n_a2iJx) SomeColor
- Diagrams.TwoD: eColor :: forall n_a2LyX. Lens' (EnvelopeOpts n_a2LyX) (Colour Double)
+ Diagrams.TwoD: eColor :: forall n_a2LYZ. Lens' (EnvelopeOpts n_a2LYZ) (Colour Double)
- Diagrams.TwoD: eLineWidth :: forall n_a2LyX n_a2LBc. Lens (EnvelopeOpts n_a2LyX) (EnvelopeOpts n_a2LBc) (Measure n_a2LyX) (Measure n_a2LBc)
+ Diagrams.TwoD: eLineWidth :: forall n_a2LYZ n_a2M1e. Lens (EnvelopeOpts n_a2LYZ) (EnvelopeOpts n_a2M1e) (Measure n_a2LYZ) (Measure n_a2M1e)
- Diagrams.TwoD: ePoints :: forall n_a2LyX. Lens' (EnvelopeOpts n_a2LyX) Int
+ Diagrams.TwoD: ePoints :: forall n_a2LYZ. Lens' (EnvelopeOpts n_a2LYZ) Int
- Diagrams.TwoD: oColor :: forall n_a2LxY. Lens' (OriginOpts n_a2LxY) (Colour Double)
+ Diagrams.TwoD: oColor :: forall n_a2LY0. Lens' (OriginOpts n_a2LY0) (Colour Double)
- Diagrams.TwoD: oMinSize :: forall n_a2LxY. Lens' (OriginOpts n_a2LxY) n_a2LxY
+ Diagrams.TwoD: oMinSize :: forall n_a2LY0. Lens' (OriginOpts n_a2LY0) n_a2LY0
- Diagrams.TwoD: oScale :: forall n_a2LxY. Lens' (OriginOpts n_a2LxY) n_a2LxY
+ Diagrams.TwoD: oScale :: forall n_a2LY0. Lens' (OriginOpts n_a2LY0) n_a2LY0
- Diagrams.TwoD: radiusBL :: forall d_a1YYk. Lens' (RoundedRectOpts d_a1YYk) d_a1YYk
+ Diagrams.TwoD: radiusBL :: forall d_a1ZoV. Lens' (RoundedRectOpts d_a1ZoV) d_a1ZoV
- Diagrams.TwoD: radiusBR :: forall d_a1YYk. Lens' (RoundedRectOpts d_a1YYk) d_a1YYk
+ Diagrams.TwoD: radiusBR :: forall d_a1ZoV. Lens' (RoundedRectOpts d_a1ZoV) d_a1ZoV
- Diagrams.TwoD: radiusTL :: forall d_a1YYk. Lens' (RoundedRectOpts d_a1YYk) d_a1YYk
+ Diagrams.TwoD: radiusTL :: forall d_a1ZoV. Lens' (RoundedRectOpts d_a1ZoV) d_a1ZoV
- Diagrams.TwoD: radiusTR :: forall d_a1YYk. Lens' (RoundedRectOpts d_a1YYk) d_a1YYk
+ Diagrams.TwoD: radiusTR :: forall d_a1ZoV. Lens' (RoundedRectOpts d_a1ZoV) d_a1ZoV
- Diagrams.TwoD: tColor :: forall n_a2LBB. Lens' (TraceOpts n_a2LBB) (Colour Double)
+ Diagrams.TwoD: tColor :: forall n_a2M1D. Lens' (TraceOpts n_a2M1D) (Colour Double)
- Diagrams.TwoD: tMinSize :: forall n_a2LBB. Lens' (TraceOpts n_a2LBB) n_a2LBB
+ Diagrams.TwoD: tMinSize :: forall n_a2M1D. Lens' (TraceOpts n_a2M1D) n_a2M1D
- Diagrams.TwoD: tPoints :: forall n_a2LBB. Lens' (TraceOpts n_a2LBB) Int
+ Diagrams.TwoD: tPoints :: forall n_a2M1D. Lens' (TraceOpts n_a2M1D) Int
- Diagrams.TwoD: tScale :: forall n_a2LBB. Lens' (TraceOpts n_a2LBB) n_a2LBB
+ Diagrams.TwoD: tScale :: forall n_a2M1D. Lens' (TraceOpts n_a2M1D) n_a2M1D
- Diagrams.TwoD.Attributes: _LG :: forall n_a2ijv. Prism' (Texture n_a2ijv) (LGradient n_a2ijv)
+ Diagrams.TwoD.Attributes: _LG :: forall n_a2iJx. Prism' (Texture n_a2iJx) (LGradient n_a2iJx)
- Diagrams.TwoD.Attributes: _RG :: forall n_a2ijv. Prism' (Texture n_a2ijv) (RGradient n_a2ijv)
+ Diagrams.TwoD.Attributes: _RG :: forall n_a2iJx. Prism' (Texture n_a2iJx) (RGradient n_a2iJx)
- Diagrams.TwoD.Attributes: _SC :: forall n_a2ijv. Prism' (Texture n_a2ijv) SomeColor
+ Diagrams.TwoD.Attributes: _SC :: forall n_a2iJx. Prism' (Texture n_a2iJx) SomeColor
- Diagrams.TwoD.Model: eColor :: forall n_a2LyX. Lens' (EnvelopeOpts n_a2LyX) (Colour Double)
+ Diagrams.TwoD.Model: eColor :: forall n_a2LYZ. Lens' (EnvelopeOpts n_a2LYZ) (Colour Double)
- Diagrams.TwoD.Model: eLineWidth :: forall n_a2LyX n_a2LBc. Lens (EnvelopeOpts n_a2LyX) (EnvelopeOpts n_a2LBc) (Measure n_a2LyX) (Measure n_a2LBc)
+ Diagrams.TwoD.Model: eLineWidth :: forall n_a2LYZ n_a2M1e. Lens (EnvelopeOpts n_a2LYZ) (EnvelopeOpts n_a2M1e) (Measure n_a2LYZ) (Measure n_a2M1e)
- Diagrams.TwoD.Model: ePoints :: forall n_a2LyX. Lens' (EnvelopeOpts n_a2LyX) Int
+ Diagrams.TwoD.Model: ePoints :: forall n_a2LYZ. Lens' (EnvelopeOpts n_a2LYZ) Int
- Diagrams.TwoD.Model: oColor :: forall n_a2LxY. Lens' (OriginOpts n_a2LxY) (Colour Double)
+ Diagrams.TwoD.Model: oColor :: forall n_a2LY0. Lens' (OriginOpts n_a2LY0) (Colour Double)
- Diagrams.TwoD.Model: oMinSize :: forall n_a2LxY. Lens' (OriginOpts n_a2LxY) n_a2LxY
+ Diagrams.TwoD.Model: oMinSize :: forall n_a2LY0. Lens' (OriginOpts n_a2LY0) n_a2LY0
- Diagrams.TwoD.Model: oScale :: forall n_a2LxY. Lens' (OriginOpts n_a2LxY) n_a2LxY
+ Diagrams.TwoD.Model: oScale :: forall n_a2LY0. Lens' (OriginOpts n_a2LY0) n_a2LY0
- Diagrams.TwoD.Model: tColor :: forall n_a2LBB. Lens' (TraceOpts n_a2LBB) (Colour Double)
+ Diagrams.TwoD.Model: tColor :: forall n_a2M1D. Lens' (TraceOpts n_a2M1D) (Colour Double)
- Diagrams.TwoD.Model: tMinSize :: forall n_a2LBB. Lens' (TraceOpts n_a2LBB) n_a2LBB
+ Diagrams.TwoD.Model: tMinSize :: forall n_a2M1D. Lens' (TraceOpts n_a2M1D) n_a2M1D
- Diagrams.TwoD.Model: tPoints :: forall n_a2LBB. Lens' (TraceOpts n_a2LBB) Int
+ Diagrams.TwoD.Model: tPoints :: forall n_a2M1D. Lens' (TraceOpts n_a2M1D) Int
- Diagrams.TwoD.Model: tScale :: forall n_a2LBB. Lens' (TraceOpts n_a2LBB) n_a2LBB
+ Diagrams.TwoD.Model: tScale :: forall n_a2M1D. Lens' (TraceOpts n_a2M1D) n_a2M1D
- Diagrams.TwoD.Shapes: radiusBL :: forall d_a1YYk. Lens' (RoundedRectOpts d_a1YYk) d_a1YYk
+ Diagrams.TwoD.Shapes: radiusBL :: forall d_a1ZoV. Lens' (RoundedRectOpts d_a1ZoV) d_a1ZoV
- Diagrams.TwoD.Shapes: radiusBR :: forall d_a1YYk. Lens' (RoundedRectOpts d_a1YYk) d_a1YYk
+ Diagrams.TwoD.Shapes: radiusBR :: forall d_a1ZoV. Lens' (RoundedRectOpts d_a1ZoV) d_a1ZoV
- Diagrams.TwoD.Shapes: radiusTL :: forall d_a1YYk. Lens' (RoundedRectOpts d_a1YYk) d_a1YYk
+ Diagrams.TwoD.Shapes: radiusTL :: forall d_a1ZoV. Lens' (RoundedRectOpts d_a1ZoV) d_a1ZoV
- Diagrams.TwoD.Shapes: radiusTR :: forall d_a1YYk. Lens' (RoundedRectOpts d_a1YYk) d_a1YYk
+ Diagrams.TwoD.Shapes: radiusTR :: forall d_a1ZoV. Lens' (RoundedRectOpts d_a1ZoV) d_a1ZoV
Files
- CHANGELOG.md +4/−0
- diagrams-lib.cabal +4/−4
- src/Diagrams/Combinators.hs +3/−3
CHANGELOG.md view
@@ -1,3 +1,7 @@+## [v1.4.2.3](https://github.com/diagrams/diagrams-lib/tree/v1.4.2.2) (2018-06-11)++- Bug fix for `extrudeEnvelope` and friends ([#316](https://github.com/diagrams/diagrams-lib/issues/316))+ ## [v1.4.2.2](https://github.com/diagrams/diagrams-lib/tree/v1.4.2.2) (2018-05-08) - Fixes for GHC < 8.0
diagrams-lib.cabal view
@@ -1,5 +1,5 @@ Name: diagrams-lib-Version: 1.4.2.2+Version: 1.4.2.3 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@@ -104,7 +104,7 @@ containers >= 0.3 && < 0.6, array >= 0.3 && < 0.6, semigroups >= 0.3.4 && < 0.19,- monoid-extras >= 0.3 && < 0.5,+ monoid-extras >= 0.3 && < 0.6, dual-tree >= 0.2 && < 0.3, diagrams-core >= 1.4 && < 1.5, diagrams-solve >= 0.1 && < 0.2,@@ -123,7 +123,7 @@ adjunctions >= 4.0 && < 5.0, distributive >=0.2.2 && < 1.0, process >= 1.1 && < 1.7,- fsnotify >= 0.2.1 && < 0.3,+ fsnotify >= 0.2.1 && < 0.4, directory >= 1.2 && < 1.4, unordered-containers >= 0.2 && < 0.3, text >= 0.7.1 && < 1.3,@@ -158,7 +158,7 @@ , Instances hs-source-dirs: test build-depends: base,- tasty >= 0.10 && < 1.1,+ tasty >= 0.10 && < 1.2, tasty-hunit >= 0.9.2 && < 0.11, tasty-quickcheck >= 0.8 && < 0.11, deepseq >= 1.3 && < 1.5,
src/Diagrams/Combinators.hs view
@@ -145,7 +145,7 @@ extrudeEnvelope :: (Metric v, OrderedField n, Monoid' m) => v n -> QDiagram b v n m -> QDiagram b v n m-extrudeEnvelope = deformEnvelope 0.5+extrudeEnvelope = deformEnvelope 1 -- | @intrudeEnvelope v d@ asymmetrically \"intrudes\" the envelope of -- a diagram away from the given direction. All parts of the envelope@@ -157,7 +157,7 @@ intrudeEnvelope :: (Metric v, OrderedField n, Monoid' m) => v n -> QDiagram b v n m -> QDiagram b v n m-intrudeEnvelope = deformEnvelope (-0.5)+intrudeEnvelope = deformEnvelope (-1) -- Utility for extrudeEnvelope / intrudeEnvelope deformEnvelope@@ -167,7 +167,7 @@ where deformE = Option . fmap deformE' . getOption deformE' env v'- | dp > 0 = Max $ getMax (env v') + (dp * s) / norm v'+ | dp > 0 = Max $ getMax (env v') + (dp * s) / quadrance v' | otherwise = env v' where dp = v' `dot` v