packages feed

diagrams-contrib 1.4.4 → 1.4.5

raw patch · 3 files changed

+41/−14 lines, 3 filesdep ~linearPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependency ranges changed: linear

API changes (from Hackage documentation)

- Diagrams.Example.Logo: a1 :: (HasStyle b, HasOrigin b, Alignable b, TrailLike b, Juxtaposable b, Semigroup b, Typeable (N b), Transformable b, V b ~# V2) => b
+ Diagrams.Example.Logo: a1 :: (V b ~ V2, HasOrigin b, Alignable b, R1 (V b), TrailLike b, Juxtaposable b, Semigroup b, Typeable (N b), HasStyle b, Transformable b) => b
- Diagrams.Example.Logo: disk :: (TrailLike b, Transformable b, Typeable (N b), HasStyle b, V b ~# V2) => Colour Double -> b
+ Diagrams.Example.Logo: disk :: (V b ~ V2, Transformable b, TrailLike b, Typeable (N b), HasStyle b) => Colour Double -> b
- Diagrams.Example.Logo: grid :: (Transformable a, Alignable a, TrailLike a, Monoid a, HasOrigin a, Juxtaposable a, V a ~# V2) => a
+ Diagrams.Example.Logo: grid :: (V a ~ V2, Monoid a, HasOrigin a, Juxtaposable a, TrailLike a, Alignable a, Transformable a, R2 (V a)) => a
- Diagrams.Example.Logo: i :: (Monoid m, TrailLike (QDiagram b V2 n m), RealFloat n, Typeable n) => QDiagram b V2 n m
+ Diagrams.Example.Logo: i :: forall {m} {n} {b}. (Monoid m, TrailLike (QDiagram b V2 n m), RealFloat n, Typeable n) => QDiagram b V2 n m
- Diagrams.Example.Logo: s :: (HasStyle b, Transformable b, TrailLike b, HasOrigin b, Monoid b, Typeable (N b), V b ~# V2) => b
+ Diagrams.Example.Logo: s :: (V b ~ V2, Monoid b, HasOrigin b, Transformable b, TrailLike b, Typeable (N b), HasStyle b) => b
- Diagrams.Example.Logo: sierpinski :: (Semigroup p, Juxtaposable p, TrailLike p, Num t, Alignable p, HasOrigin p, Eq t, V p ~# V2) => t -> p
+ Diagrams.Example.Logo: sierpinski :: (V a ~ V2, Semigroup a, Juxtaposable a, Num t, TrailLike a, R1 (V a), Alignable a, HasOrigin a, Eq t) => t -> a
- Diagrams.TwoD.Grid: gridLL :: forall n_aAbX. Lens' (GridOpts n_aAbX) (V2 n_aAbX)
+ Diagrams.TwoD.Grid: gridLL :: forall n_apLM. Lens' (GridOpts n_apLM) (V2 n_apLM)
- Diagrams.TwoD.Grid: gridLR :: forall n_aAbX. Lens' (GridOpts n_aAbX) (V2 n_aAbX)
+ Diagrams.TwoD.Grid: gridLR :: forall n_apLM. Lens' (GridOpts n_apLM) (V2 n_apLM)
- Diagrams.TwoD.Grid: gridLineWidth :: forall n_aAbX. Lens' (GridOpts n_aAbX) (Measure n_aAbX)
+ Diagrams.TwoD.Grid: gridLineWidth :: forall n_apLM. Lens' (GridOpts n_apLM) (Measure n_apLM)
- Diagrams.TwoD.Grid: gridUL :: forall n_aAbX. Lens' (GridOpts n_aAbX) (V2 n_aAbX)
+ Diagrams.TwoD.Grid: gridUL :: forall n_apLM. Lens' (GridOpts n_apLM) (V2 n_apLM)
- Diagrams.TwoD.Grid: gridXColour :: forall n_aAbX. Lens' (GridOpts n_aAbX) (Colour Double)
+ Diagrams.TwoD.Grid: gridXColour :: forall n_apLM. Lens' (GridOpts n_apLM) (Colour Double)
- Diagrams.TwoD.Grid: gridYColour :: forall n_aAbX. Lens' (GridOpts n_aAbX) (Colour Double)
+ Diagrams.TwoD.Grid: gridYColour :: forall n_apLM. Lens' (GridOpts n_apLM) (Colour Double)
- Diagrams.TwoD.Grid: highLightLineColour :: forall n_aAbW. Lens' (HighlightLineOpts n_aAbW) (Colour Double)
+ Diagrams.TwoD.Grid: highLightLineColour :: forall n_apLL. Lens' (HighlightLineOpts n_apLL) (Colour Double)
- Diagrams.TwoD.Grid: highLightLineDashingOffset :: forall n_aAbW. Lens' (HighlightLineOpts n_aAbW) (Measure n_aAbW)
+ Diagrams.TwoD.Grid: highLightLineDashingOffset :: forall n_apLL. Lens' (HighlightLineOpts n_apLL) (Measure n_apLL)
- Diagrams.TwoD.Grid: highLightLineDashingOnOff :: forall n_aAbW. Lens' (HighlightLineOpts n_aAbW) [Measure n_aAbW]
+ Diagrams.TwoD.Grid: highLightLineDashingOnOff :: forall n_apLL. Lens' (HighlightLineOpts n_apLL) [Measure n_apLL]
- Diagrams.TwoD.Grid: highLightLineWidth :: forall n_aAbW. Lens' (HighlightLineOpts n_aAbW) (Measure n_aAbW)
+ Diagrams.TwoD.Grid: highLightLineWidth :: forall n_apLL. Lens' (HighlightLineOpts n_apLL) (Measure n_apLL)
- Diagrams.TwoD.Layout.Tree: edgeLen :: forall n_aNDe. Lens' (ForceLayoutTreeOpts n_aNDe) n_aNDe
+ Diagrams.TwoD.Layout.Tree: edgeLen :: forall n_aBzU. Lens' (ForceLayoutTreeOpts n_aBzU) n_aBzU
- Diagrams.TwoD.Layout.Tree: forceLayoutOpts :: forall n_aNDe. Lens' (ForceLayoutTreeOpts n_aNDe) (ForceLayoutOpts n_aNDe)
+ Diagrams.TwoD.Layout.Tree: forceLayoutOpts :: forall n_aBzU. Lens' (ForceLayoutTreeOpts n_aBzU) (ForceLayoutOpts n_aBzU)
- Diagrams.TwoD.Layout.Tree: slHSep :: forall n_aMPf a_aMPg. Lens' (SymmLayoutOpts n_aMPf a_aMPg) n_aMPf
+ Diagrams.TwoD.Layout.Tree: slHSep :: forall n_aB3S a_aB3T. Lens' (SymmLayoutOpts n_aB3S a_aB3T) n_aB3S
- Diagrams.TwoD.Layout.Tree: slHeight :: forall n_aMPf a_aMPg. Lens' (SymmLayoutOpts n_aMPf a_aMPg) (a_aMPg -> (n_aMPf, n_aMPf))
+ Diagrams.TwoD.Layout.Tree: slHeight :: forall n_aB3S a_aB3T. Lens' (SymmLayoutOpts n_aB3S a_aB3T) (a_aB3T -> (n_aB3S, n_aB3S))
- Diagrams.TwoD.Layout.Tree: slVSep :: forall n_aMPf a_aMPg. Lens' (SymmLayoutOpts n_aMPf a_aMPg) n_aMPf
+ Diagrams.TwoD.Layout.Tree: slVSep :: forall n_aB3S a_aB3T. Lens' (SymmLayoutOpts n_aB3S a_aB3T) n_aB3S
- Diagrams.TwoD.Layout.Tree: slWidth :: forall n_aMPf a_aMPg. Lens' (SymmLayoutOpts n_aMPf a_aMPg) (a_aMPg -> (n_aMPf, n_aMPf))
+ Diagrams.TwoD.Layout.Tree: slWidth :: forall n_aB3S a_aB3T. Lens' (SymmLayoutOpts n_aB3S a_aB3T) (a_aB3T -> (n_aB3S, n_aB3S))
- Diagrams.TwoD.Layout.Tree: springK :: forall n_aNDe. Lens' (ForceLayoutTreeOpts n_aNDe) n_aNDe
+ Diagrams.TwoD.Layout.Tree: springK :: forall n_aBzU. Lens' (ForceLayoutTreeOpts n_aBzU) n_aBzU
- Diagrams.TwoD.Layout.Tree: staticK :: forall n_aNDe. Lens' (ForceLayoutTreeOpts n_aNDe) n_aNDe
+ Diagrams.TwoD.Layout.Tree: staticK :: forall n_aBzU. Lens' (ForceLayoutTreeOpts n_aBzU) n_aBzU
- Diagrams.TwoD.Path.Metafont.Types: c1 :: forall n_aWz0. Lens' (ControlJoin n_aWz0) (P2 n_aWz0)
+ Diagrams.TwoD.Path.Metafont.Types: c1 :: forall n_aKcb. Lens' (ControlJoin n_aKcb) (P2 n_aKcb)
- Diagrams.TwoD.Path.Metafont.Types: c2 :: forall n_aWz0. Lens' (ControlJoin n_aWz0) (P2 n_aWz0)
+ Diagrams.TwoD.Path.Metafont.Types: c2 :: forall n_aKcb. Lens' (ControlJoin n_aKcb) (P2 n_aKcb)
- Diagrams.TwoD.Path.Metafont.Types: d1 :: forall d_aWui j_aWuj. Lens' (PathJoin d_aWui j_aWuj) d_aWui
+ Diagrams.TwoD.Path.Metafont.Types: d1 :: forall d_aK7M j_aK7N. Lens' (PathJoin d_aK7M j_aK7N) d_aK7M
- Diagrams.TwoD.Path.Metafont.Types: d2 :: forall d_aWui j_aWuj. Lens' (PathJoin d_aWui j_aWuj) d_aWui
+ Diagrams.TwoD.Path.Metafont.Types: d2 :: forall d_aK7M j_aK7N. Lens' (PathJoin d_aK7M j_aK7N) d_aK7M
- Diagrams.TwoD.Path.Metafont.Types: j :: forall d_aWui j_aWuj j_aWyo. Lens (PathJoin d_aWui j_aWuj) (PathJoin d_aWui j_aWyo) j_aWuj j_aWyo
+ Diagrams.TwoD.Path.Metafont.Types: j :: forall d_aK7M j_aK7N j_aKbz. Lens (PathJoin d_aK7M j_aK7N) (PathJoin d_aK7M j_aKbz) j_aK7N j_aKbz
- Diagrams.TwoD.Path.Metafont.Types: loop :: forall d_aWKp j_aWKq n_aWKr. Lens' (MFPath d_aWKp j_aWKq n_aWKr) Bool
+ Diagrams.TwoD.Path.Metafont.Types: loop :: forall d_aKmU j_aKmV n_aKmW. Lens' (MFPath d_aKmU j_aKmV n_aKmW) Bool
- Diagrams.TwoD.Path.Metafont.Types: pj :: forall d_aWKs j_aWKt n_aWKu d_aWUl j_aWUm. Lens (MetafontSegment d_aWKs j_aWKt n_aWKu) (MetafontSegment d_aWUl j_aWUm n_aWKu) (PathJoin d_aWKs j_aWKt) (PathJoin d_aWUl j_aWUm)
+ Diagrams.TwoD.Path.Metafont.Types: pj :: forall d_aKmX j_aKmY n_aKmZ d_aKvZ j_aKw0. Lens (MetafontSegment d_aKmX j_aKmY n_aKmZ) (MetafontSegment d_aKvZ j_aKw0 n_aKmZ) (PathJoin d_aKmX j_aKmY) (PathJoin d_aKvZ j_aKw0)
- Diagrams.TwoD.Path.Metafont.Types: segs :: forall d_aWKp j_aWKq n_aWKr d_aWWN j_aWWO n_aWWP. Lens (MFPath d_aWKp j_aWKq n_aWKr) (MFPath d_aWWN j_aWWO n_aWWP) [MetafontSegment d_aWKp j_aWKq n_aWKr] [MetafontSegment d_aWWN j_aWWO n_aWWP]
+ Diagrams.TwoD.Path.Metafont.Types: segs :: forall d_aKmU j_aKmV n_aKmW d_aKyt j_aKyu n_aKyv. Lens (MFPath d_aKmU j_aKmV n_aKmW) (MFPath d_aKyt j_aKyu n_aKyv) [MetafontSegment d_aKmU j_aKmV n_aKmW] [MetafontSegment d_aKyt j_aKyu n_aKyv]
- Diagrams.TwoD.Path.Metafont.Types: t1 :: forall n_aWz1. Lens' (TensionJoin n_aWz1) (Tension n_aWz1)
+ Diagrams.TwoD.Path.Metafont.Types: t1 :: forall n_aKcc. Lens' (TensionJoin n_aKcc) (Tension n_aKcc)
- Diagrams.TwoD.Path.Metafont.Types: t2 :: forall n_aWz1. Lens' (TensionJoin n_aWz1) (Tension n_aWz1)
+ Diagrams.TwoD.Path.Metafont.Types: t2 :: forall n_aKcc. Lens' (TensionJoin n_aKcc) (Tension n_aKcc)
- Diagrams.TwoD.Path.Metafont.Types: x1 :: forall d_aWKs j_aWKt n_aWKu. Lens' (MetafontSegment d_aWKs j_aWKt n_aWKu) (P2 n_aWKu)
+ Diagrams.TwoD.Path.Metafont.Types: x1 :: forall d_aKmX j_aKmY n_aKmZ. Lens' (MetafontSegment d_aKmX j_aKmY n_aKmZ) (P2 n_aKmZ)
- Diagrams.TwoD.Path.Metafont.Types: x2 :: forall d_aWKs j_aWKt n_aWKu. Lens' (MetafontSegment d_aWKs j_aWKt n_aWKu) (P2 n_aWKu)
+ Diagrams.TwoD.Path.Metafont.Types: x2 :: forall d_aKmX j_aKmY n_aKmZ. Lens' (MetafontSegment d_aKmX j_aKmY n_aKmZ) (P2 n_aKmZ)
- Diagrams.TwoD.Sunburst: colors :: forall n_a1cca. Lens' (SunburstOpts n_a1cca) [Colour Double]
+ Diagrams.TwoD.Sunburst: colors :: forall n_aZG6. Lens' (SunburstOpts n_aZG6) [Colour Double]
- Diagrams.TwoD.Sunburst: radius :: forall n_a1cca. Lens' (SunburstOpts n_a1cca) n_a1cca
+ Diagrams.TwoD.Sunburst: radius :: forall n_aZG6. Lens' (SunburstOpts n_aZG6) n_aZG6
- Diagrams.TwoD.Sunburst: sectionWidth :: forall n_a1cca. Lens' (SunburstOpts n_a1cca) n_a1cca
+ Diagrams.TwoD.Sunburst: sectionWidth :: forall n_aZG6. Lens' (SunburstOpts n_aZG6) n_aZG6

Files

CHANGES.markdown view
@@ -1,8 +1,33 @@+1.4.5 (12 Nov 2022)+-------------------++- `TwoD.Layout.Grid`: Return `mempty` in `gridCat` and `gridSnake` on+  empty input ([#89](https://github.com/diagrams/diagrams-contrib/pull/89))+ 1.4.4 (12 Nov 2019) -------------------  - Updated to build on GHC 8.8 - New module `Diagrams.TwoD.Path.IntersectionExtras`++- Hackage revisions (latest revision 7 Nov 2022)+    - r1: allow lens-4.19 and linear-1.21+    - r2: allow+        - base-4.15+        - monoid-extras-0.6+        - diagrams-core-1.5+        - lens-5.0+        - random-1.2+        - QuickCheck-2.14+    - r3: update homepage URL+    - r4: allow+        - `base-4.16`+        - `hashable-1.4`+        - `lens-5.1`+        - `semigroups-0.20`+    - r5: allow `text-2.0`+    - r6: allow `base-4.17`, `lens-5.2`, and test with GHC 9.4+    - r7: allow `MonadRandom-0.6`  1.4.3 (14 May 2018) -------------------
diagrams-contrib.cabal view
@@ -1,10 +1,10 @@ name:                diagrams-contrib-version:             1.4.4+version:             1.4.5 synopsis:            Collection of user contributions to diagrams EDSL description:         A collection of user contributions for diagrams,                      an embedded domain-specific language for generation                      of vector graphics.-homepage:            http://projects.haskell.org/diagrams/+homepage:            https://diagrams.github.io/ license:             BSD3 license-file:        LICENSE author:              Various@@ -15,7 +15,7 @@ cabal-version:       1.18 extra-source-files:  README.markdown, CHANGES.markdown, diagrams/*.svg, CONTRIBUTORS extra-doc-files:     diagrams/*.svg-tested-with:         GHC ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.3 || ==8.6.5 || ==8.8.1+tested-with:         GHC ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.4 || ==9.4.1 Source-repository head   type:     git   location: http://github.com/diagrams/diagrams-contrib.git@@ -51,30 +51,30 @@                        Diagrams.TwoD.Path.Metafont.Internal                        Diagrams.TwoD.Path.Metafont.Combinators                        Diagrams.TwoD.Path.Metafont.Parser-  build-depends:       base >= 4.8 && < 4.14,+  build-depends:       base >= 4.8 && < 4.18,                        mtl >= 2.0 && < 2.3,                        mtl-compat >= 0.2.1 && < 0.3,                        containers > 0.4 && < 0.7,                        split >= 0.2.1 && < 0.3,                        colour >= 2.3.1 && < 2.4,                        split >= 0.2.1 && < 0.3,-                       monoid-extras >= 0.4.2 && < 0.6,-                       diagrams-core >= 1.4 && < 1.5,+                       monoid-extras >= 0.4.2 && < 0.7,+                       diagrams-core >= 1.4 && < 1.6,                        diagrams-lib >= 1.4 && < 1.5,                        diagrams-solve >= 0.1 && < 0.2,-                       lens >= 4.0 && < 4.19,-                       linear >= 1.11.3 && < 1.21,+                       lens >= 4.0 && < 5.3,+                       linear >= 1.11.3 && < 1.22,                        force-layout >= 0.4 && < 0.5,                        data-default >= 0.5.2 && < 0.8,-                       MonadRandom >= 0.1.8 && < 0.6,-                       random >= 1.0 && < 1.2,+                       MonadRandom >= 0.1.8 && < 0.7,+                       random >= 1.0 && < 1.3,                        circle-packing >= 0.1 && < 0.2,                        parsec >= 3.1 && < 3.2,-                       text >= 0.11 && < 1.3,+                       text >= 0.11 && < 2.1,                        data-default-class < 0.2,-                       semigroups >= 0.3.4 && < 0.20,+                       semigroups >= 0.3.4 && < 0.21,                        cubicbezier >= 0.6 && < 0.7,-                       hashable >= 0.1.2 && < 1.4,+                       hashable >= 0.1.2 && < 1.5,                        mfsolve >= 0.3 && < 0.4   hs-source-dirs:      src   default-language:    Haskell2010@@ -89,7 +89,7 @@                        Diagrams.TwoD.Path.Turtle.Internal    build-depends:       HUnit                      >= 1.2 && < 1.7,-                       QuickCheck                 >= 2.4 && < 2.14,+                       QuickCheck                 >= 2.4 && < 2.15,                        containers                 >= 0.3 && < 0.7,                        test-framework             >= 0.4 && < 0.9,                        test-framework-hunit       >= 0.2 && < 0.4,
src/Diagrams/TwoD/Layout/Grid.hs view
@@ -48,6 +48,7 @@   :: TypeableFloat n   => [QDiagram b V2 n Any]   -> QDiagram b V2 n Any+gridCat [] = mempty gridCat diagrams = gridCat' (intSqrt $ length diagrams) diagrams  -- | Same as 'gridCat', but with a specified number of columns.@@ -76,6 +77,7 @@   :: TypeableFloat n   => [QDiagram b V2 n Any]   -> QDiagram b V2 n Any+gridSnake [] = mempty gridSnake diagrams = gridSnake' (intSqrt $ length diagrams) diagrams  -- | Same as 'gridSnake', but with a specified number of columns.