diagrams-contrib 1.4.2.1 → 1.4.3
raw patch · 6 files changed
+27/−10 lines, 6 filesdep ~QuickCheckdep ~basedep ~containersPVP: major bump suggested
API removals or changes: PVP suggests a major version bump
Dependency ranges changed: QuickCheck, base, containers, lens, monoid-extras
API changes (from Hackage documentation)
+ Diagrams.TwoD.Path.Follow: instance (GHC.Classes.Ord n, GHC.Float.Floating n) => Data.Semigroup.Semigroup (Diagrams.TwoD.Path.Follow.Following n)
- Diagrams.TwoD.Grid: gridLL :: forall n_a1fzT. Lens' (GridOpts n_a1fzT) (V2 n_a1fzT)
+ Diagrams.TwoD.Grid: gridLL :: forall n_a1fQI. Lens' (GridOpts n_a1fQI) (V2 n_a1fQI)
- Diagrams.TwoD.Grid: gridLR :: forall n_a1fzT. Lens' (GridOpts n_a1fzT) (V2 n_a1fzT)
+ Diagrams.TwoD.Grid: gridLR :: forall n_a1fQI. Lens' (GridOpts n_a1fQI) (V2 n_a1fQI)
- Diagrams.TwoD.Grid: gridLineWidth :: forall n_a1fzT. Lens' (GridOpts n_a1fzT) (Measure n_a1fzT)
+ Diagrams.TwoD.Grid: gridLineWidth :: forall n_a1fQI. Lens' (GridOpts n_a1fQI) (Measure n_a1fQI)
- Diagrams.TwoD.Grid: gridUL :: forall n_a1fzT. Lens' (GridOpts n_a1fzT) (V2 n_a1fzT)
+ Diagrams.TwoD.Grid: gridUL :: forall n_a1fQI. Lens' (GridOpts n_a1fQI) (V2 n_a1fQI)
- Diagrams.TwoD.Grid: gridXColour :: forall n_a1fzT. Lens' (GridOpts n_a1fzT) (Colour Double)
+ Diagrams.TwoD.Grid: gridXColour :: forall n_a1fQI. Lens' (GridOpts n_a1fQI) (Colour Double)
- Diagrams.TwoD.Grid: gridYColour :: forall n_a1fzT. Lens' (GridOpts n_a1fzT) (Colour Double)
+ Diagrams.TwoD.Grid: gridYColour :: forall n_a1fQI. Lens' (GridOpts n_a1fQI) (Colour Double)
- Diagrams.TwoD.Grid: highLightLineColour :: forall n_a1fzS. Lens' (HighlightLineOpts n_a1fzS) (Colour Double)
+ Diagrams.TwoD.Grid: highLightLineColour :: forall n_a1fQH. Lens' (HighlightLineOpts n_a1fQH) (Colour Double)
- Diagrams.TwoD.Grid: highLightLineDashingOffset :: forall n_a1fzS. Lens' (HighlightLineOpts n_a1fzS) (Measure n_a1fzS)
+ Diagrams.TwoD.Grid: highLightLineDashingOffset :: forall n_a1fQH. Lens' (HighlightLineOpts n_a1fQH) (Measure n_a1fQH)
- Diagrams.TwoD.Grid: highLightLineDashingOnOff :: forall n_a1fzS. Lens' (HighlightLineOpts n_a1fzS) [Measure n_a1fzS]
+ Diagrams.TwoD.Grid: highLightLineDashingOnOff :: forall n_a1fQH. Lens' (HighlightLineOpts n_a1fQH) [Measure n_a1fQH]
- Diagrams.TwoD.Grid: highLightLineWidth :: forall n_a1fzS. Lens' (HighlightLineOpts n_a1fzS) (Measure n_a1fzS)
+ Diagrams.TwoD.Grid: highLightLineWidth :: forall n_a1fQH. Lens' (HighlightLineOpts n_a1fQH) (Measure n_a1fQH)
- Diagrams.TwoD.Layout.Tree: edgeLen :: forall n_a1v0X. Lens' (ForceLayoutTreeOpts n_a1v0X) n_a1v0X
+ Diagrams.TwoD.Layout.Tree: edgeLen :: forall n_a1viG. Lens' (ForceLayoutTreeOpts n_a1viG) n_a1viG
- Diagrams.TwoD.Layout.Tree: forceLayoutOpts :: forall n_a1v0X. Lens' (ForceLayoutTreeOpts n_a1v0X) (ForceLayoutOpts n_a1v0X)
+ Diagrams.TwoD.Layout.Tree: forceLayoutOpts :: forall n_a1viG. Lens' (ForceLayoutTreeOpts n_a1viG) (ForceLayoutOpts n_a1viG)
- Diagrams.TwoD.Layout.Tree: slHSep :: forall n_a1uh3 a_a1uh4. Lens' (SymmLayoutOpts n_a1uh3 a_a1uh4) n_a1uh3
+ Diagrams.TwoD.Layout.Tree: slHSep :: forall n_a1uyA a_a1uyB. Lens' (SymmLayoutOpts n_a1uyA a_a1uyB) n_a1uyA
- Diagrams.TwoD.Layout.Tree: slHeight :: forall n_a1uh3 a_a1uh4. Lens' (SymmLayoutOpts n_a1uh3 a_a1uh4) (a_a1uh4 -> (n_a1uh3, n_a1uh3))
+ Diagrams.TwoD.Layout.Tree: slHeight :: forall n_a1uyA a_a1uyB. Lens' (SymmLayoutOpts n_a1uyA a_a1uyB) (a_a1uyB -> (n_a1uyA, n_a1uyA))
- Diagrams.TwoD.Layout.Tree: slVSep :: forall n_a1uh3 a_a1uh4. Lens' (SymmLayoutOpts n_a1uh3 a_a1uh4) n_a1uh3
+ Diagrams.TwoD.Layout.Tree: slVSep :: forall n_a1uyA a_a1uyB. Lens' (SymmLayoutOpts n_a1uyA a_a1uyB) n_a1uyA
- Diagrams.TwoD.Layout.Tree: slWidth :: forall n_a1uh3 a_a1uh4. Lens' (SymmLayoutOpts n_a1uh3 a_a1uh4) (a_a1uh4 -> (n_a1uh3, n_a1uh3))
+ Diagrams.TwoD.Layout.Tree: slWidth :: forall n_a1uyA a_a1uyB. Lens' (SymmLayoutOpts n_a1uyA a_a1uyB) (a_a1uyB -> (n_a1uyA, n_a1uyA))
- Diagrams.TwoD.Layout.Tree: springK :: forall n_a1v0X. Lens' (ForceLayoutTreeOpts n_a1v0X) n_a1v0X
+ Diagrams.TwoD.Layout.Tree: springK :: forall n_a1viG. Lens' (ForceLayoutTreeOpts n_a1viG) n_a1viG
- Diagrams.TwoD.Layout.Tree: staticK :: forall n_a1v0X. Lens' (ForceLayoutTreeOpts n_a1v0X) n_a1v0X
+ Diagrams.TwoD.Layout.Tree: staticK :: forall n_a1viG. Lens' (ForceLayoutTreeOpts n_a1viG) n_a1viG
- Diagrams.TwoD.Path.Metafont.Types: c1 :: forall n_a1JzF. Lens' (ControlJoin n_a1JzF) (P2 n_a1JzF)
+ Diagrams.TwoD.Path.Metafont.Types: c1 :: forall n_a1Kg8. Lens' (ControlJoin n_a1Kg8) (P2 n_a1Kg8)
- Diagrams.TwoD.Path.Metafont.Types: c2 :: forall n_a1JzF. Lens' (ControlJoin n_a1JzF) (P2 n_a1JzF)
+ Diagrams.TwoD.Path.Metafont.Types: c2 :: forall n_a1Kg8. Lens' (ControlJoin n_a1Kg8) (P2 n_a1Kg8)
- Diagrams.TwoD.Path.Metafont.Types: d1 :: forall d_a1JuZ j_a1Jv0. Lens' (PathJoin d_a1JuZ j_a1Jv0) d_a1JuZ
+ Diagrams.TwoD.Path.Metafont.Types: d1 :: forall d_a1Kbs j_a1Kbt. Lens' (PathJoin d_a1Kbs j_a1Kbt) d_a1Kbs
- Diagrams.TwoD.Path.Metafont.Types: d2 :: forall d_a1JuZ j_a1Jv0. Lens' (PathJoin d_a1JuZ j_a1Jv0) d_a1JuZ
+ Diagrams.TwoD.Path.Metafont.Types: d2 :: forall d_a1Kbs j_a1Kbt. Lens' (PathJoin d_a1Kbs j_a1Kbt) d_a1Kbs
- Diagrams.TwoD.Path.Metafont.Types: j :: forall d_a1JuZ j_a1Jv0 j_a1Jz3. Lens (PathJoin d_a1JuZ j_a1Jv0) (PathJoin d_a1JuZ j_a1Jz3) j_a1Jv0 j_a1Jz3
+ Diagrams.TwoD.Path.Metafont.Types: j :: forall d_a1Kbs j_a1Kbt j_a1Kfw. Lens (PathJoin d_a1Kbs j_a1Kbt) (PathJoin d_a1Kbs j_a1Kfw) j_a1Kbt j_a1Kfw
- Diagrams.TwoD.Path.Metafont.Types: loop :: forall d_a1JKE j_a1JKF n_a1JKG. Lens' (MFPath d_a1JKE j_a1JKF n_a1JKG) Bool
+ Diagrams.TwoD.Path.Metafont.Types: loop :: forall d_a1Kr7 j_a1Kr8 n_a1Kr9. Lens' (MFPath d_a1Kr7 j_a1Kr8 n_a1Kr9) Bool
- Diagrams.TwoD.Path.Metafont.Types: pj :: forall d_a1JKH j_a1JKI n_a1JKJ d_a1JUo j_a1JUp. Lens (MetafontSegment d_a1JKH j_a1JKI n_a1JKJ) (MetafontSegment d_a1JUo j_a1JUp n_a1JKJ) (PathJoin d_a1JKH j_a1JKI) (PathJoin d_a1JUo j_a1JUp)
+ Diagrams.TwoD.Path.Metafont.Types: pj :: forall d_a1Kra j_a1Krb n_a1Krc d_a1KAR j_a1KAS. Lens (MetafontSegment d_a1Kra j_a1Krb n_a1Krc) (MetafontSegment d_a1KAR j_a1KAS n_a1Krc) (PathJoin d_a1Kra j_a1Krb) (PathJoin d_a1KAR j_a1KAS)
- Diagrams.TwoD.Path.Metafont.Types: segs :: forall d_a1JKE j_a1JKF n_a1JKG d_a1JWB j_a1JWC n_a1JWD. Lens (MFPath d_a1JKE j_a1JKF n_a1JKG) (MFPath d_a1JWB j_a1JWC n_a1JWD) [MetafontSegment d_a1JKE j_a1JKF n_a1JKG] [MetafontSegment d_a1JWB j_a1JWC n_a1JWD]
+ Diagrams.TwoD.Path.Metafont.Types: segs :: forall d_a1Kr7 j_a1Kr8 n_a1Kr9 d_a1KD4 j_a1KD5 n_a1KD6. Lens (MFPath d_a1Kr7 j_a1Kr8 n_a1Kr9) (MFPath d_a1KD4 j_a1KD5 n_a1KD6) [MetafontSegment d_a1Kr7 j_a1Kr8 n_a1Kr9] [MetafontSegment d_a1KD4 j_a1KD5 n_a1KD6]
- Diagrams.TwoD.Path.Metafont.Types: t1 :: forall n_a1JzG. Lens' (TensionJoin n_a1JzG) (Tension n_a1JzG)
+ Diagrams.TwoD.Path.Metafont.Types: t1 :: forall n_a1Kg9. Lens' (TensionJoin n_a1Kg9) (Tension n_a1Kg9)
- Diagrams.TwoD.Path.Metafont.Types: t2 :: forall n_a1JzG. Lens' (TensionJoin n_a1JzG) (Tension n_a1JzG)
+ Diagrams.TwoD.Path.Metafont.Types: t2 :: forall n_a1Kg9. Lens' (TensionJoin n_a1Kg9) (Tension n_a1Kg9)
- Diagrams.TwoD.Path.Metafont.Types: x1 :: forall d_a1JKH j_a1JKI n_a1JKJ. Lens' (MetafontSegment d_a1JKH j_a1JKI n_a1JKJ) (P2 n_a1JKJ)
+ Diagrams.TwoD.Path.Metafont.Types: x1 :: forall d_a1Kra j_a1Krb n_a1Krc. Lens' (MetafontSegment d_a1Kra j_a1Krb n_a1Krc) (P2 n_a1Krc)
- Diagrams.TwoD.Path.Metafont.Types: x2 :: forall d_a1JKH j_a1JKI n_a1JKJ. Lens' (MetafontSegment d_a1JKH j_a1JKI n_a1JKJ) (P2 n_a1JKJ)
+ Diagrams.TwoD.Path.Metafont.Types: x2 :: forall d_a1Kra j_a1Krb n_a1Krc. Lens' (MetafontSegment d_a1Kra j_a1Krb n_a1Krc) (P2 n_a1Krc)
- Diagrams.TwoD.Sunburst: colors :: forall n_a2fIt. Lens' (SunburstOpts n_a2fIt) [Colour Double]
+ Diagrams.TwoD.Sunburst: colors :: forall n_a2gp5. Lens' (SunburstOpts n_a2gp5) [Colour Double]
- Diagrams.TwoD.Sunburst: radius :: forall n_a2fIt. Lens' (SunburstOpts n_a2fIt) n_a2fIt
+ Diagrams.TwoD.Sunburst: radius :: forall n_a2gp5. Lens' (SunburstOpts n_a2gp5) n_a2gp5
- Diagrams.TwoD.Sunburst: sectionWidth :: forall n_a2fIt. Lens' (SunburstOpts n_a2fIt) n_a2fIt
+ Diagrams.TwoD.Sunburst: sectionWidth :: forall n_a2gp5. Lens' (SunburstOpts n_a2gp5) n_a2gp5
Files
- CHANGES.markdown +7/−0
- diagrams-contrib.cabal +7/−6
- src/Diagrams/Anchors.hs +3/−0
- src/Diagrams/TwoD/Layout/Tree.hs +4/−1
- src/Diagrams/TwoD/Path/Follow.hs +1/−1
- src/Diagrams/TwoD/Path/Metafont/Types.hs +5/−2
CHANGES.markdown view
@@ -1,3 +1,10 @@+1.4.3 (14 May 2018)+-------------------++- New `Semigroup` instance for `Following`+- Allow `base-4.11` and `lens-4.16`+- Drop GHC-7.8 support+ 1.4.2.1 (9 February 2018) -------------------------
diagrams-contrib.cabal view
@@ -1,5 +1,5 @@ name: diagrams-contrib-version: 1.4.2.1+version: 1.4.3 synopsis: Collection of user contributions to diagrams EDSL description: A collection of user contributions for diagrams, an embedded domain-specific language for generation@@ -12,10 +12,10 @@ Bug-reports: http://github.com/diagrams/diagrams-contrib/issues category: Graphics build-type: Simple-cabal-version: >=1.18+cabal-version: 1.18 extra-source-files: README.markdown, CHANGES.markdown, diagrams/*.svg, CONTRIBUTORS extra-doc-files: diagrams/*.svg-tested-with: GHC == 7.8.4, GHC == 7.10.2, GHC == 8.0.1, GHC == 8.2.1+tested-with: 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-contrib.git@@ -50,18 +50,18 @@ Diagrams.TwoD.Path.Metafont.Internal Diagrams.TwoD.Path.Metafont.Combinators Diagrams.TwoD.Path.Metafont.Parser- build-depends: base >= 4.2 && < 4.11,+ build-depends: base >= 4.2 && < 4.12, mtl >= 2.0 && < 2.3, mtl-compat >= 0.2.1 && < 0.3, containers > 0.4 && < 0.6, split >= 0.2.1 && < 0.3, colour >= 2.3.1 && < 2.4, split >= 0.2.1 && < 0.3,- monoid-extras >= 0.4.2,+ monoid-extras >= 0.4.2 && < 0.6, diagrams-core >= 1.4 && < 1.5, diagrams-lib >= 1.4 && < 1.5, diagrams-solve >= 0.1 && < 0.2,- lens >= 4.0 && < 4.16,+ lens >= 4.0 && < 4.17, linear >= 1.11.3 && < 1.21, force-layout >= 0.4 && < 0.5, data-default >= 0.5.2 && < 0.8,@@ -85,6 +85,7 @@ ghc-options: -Wall other-modules: Diagrams.TwoD.Path.Turtle.Tests+ Diagrams.TwoD.Path.Turtle.Internal build-depends: HUnit >= 1.2 && < 1.7, QuickCheck >= 2.4 && < 2.12,
src/Diagrams/Anchors.hs view
@@ -1,3 +1,4 @@+{-# LANGUAGE CPP #-} {-# LANGUAGE DefaultSignatures #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeFamilies #-}@@ -58,7 +59,9 @@ import Data.Maybe (fromJust, fromMaybe) import qualified Data.Set as Set import Data.Typeable (Typeable)+#if !MIN_VERSION_base(4,11,0) import Data.Semigroup+#endif import Linear.Vector import Linear.V2
src/Diagrams/TwoD/Layout/Tree.hs view
@@ -167,10 +167,13 @@ import Data.Tree import Control.Lens (makeLenses, view, (+=), (-=), (^.))-import Data.Semigroup import Diagrams import Linear ((*^)) import Linear.Affine++#if !MIN_VERSION_base(4,11,0)+import Data.Semigroup+#endif #if __GLASGOW_HASKELL__ < 710 import Control.Applicative
src/Diagrams/TwoD/Path/Follow.hs view
@@ -61,7 +61,7 @@ -- newtype Following n = Following { unFollowing :: Semi (Trail' Line V2 n) (Angle n) }- deriving (Monoid)+ deriving (Monoid, Semigroup) -- | Note this is only an iso when considering trails equivalent up to -- rotation.
src/Diagrams/TwoD/Path/Metafont/Types.hs view
@@ -1,4 +1,4 @@-{-# LANGUAGE CPP #-}+{-# LANGUAGE CPP #-} {-# LANGUAGE DeriveFunctor #-} {-# LANGUAGE EmptyDataDecls #-} {-# LANGUAGE FlexibleInstances #-}@@ -11,7 +11,10 @@ #if __GLASGOW_HASKELL__ < 710 import Data.Monoid #endif-import Data.Semigroup++#if !MIN_VERSION_base(4,11,0)+import Data.Semigroup+#endif import Diagrams.Direction import Diagrams.TwoD.Types