Merge remote-tracking branch 'origin/master' into direction

Conflicts:
	src/Diagrams/TwoD/Arc.hs

.travis.yml

@@ -6,10 +6,10 @@ env:
     - HPVER=2013.2.0.0
     - GHCVER=7.4.2
     - GHCVER=7.6.3
-    - GHCVER=7.8.1
+    - GHCVER=7.8.2
     - GHCVER=head
   global:
-    - CABALVER=1.18
+    - CABALVER=1.20
     - HEAD_DEPS="diagrams-core"
 
 matrix:

CHANGES.markdown

@@ -1,3 +1,84 @@
+1.2 (27 May 2014)
+-----------------
+
+* **New features**
+
+    - Several attributes (such as line width, dashing size, arrowhead
+      size, and font size) that formerly had a value of type `Double`
+      now have the more general type `Measure R2`. This allows the
+      attributes to be specified relative to one of four measurement
+      frames: `Local`, `Global`, `Normalized`, and `Output`.
+
+    - New DSL for specifying measurements.
+
+    - New synonyms for specifying measurements, *e.g.* `thin`,
+      `thick`, and `medium`, `large`.
+
+    - Support for radial and linear gradients for fills and strokes.
+
+    - New `DImage` type that supports both embedded and external images in
+      Backends that support them.
+
+    - New `lengths` Traversal for setting `headLength` and `tailLength`
+      simultaneously.
+
+    - `Frustrum` and `Box` shapes added to `Diagrams.ThreeD.Shapes`.
+
+    - New function `quartForm` to find roots of quartic polynomials.
+
+    - New Lenses for polar coordinates.
+
+    - New trig functions, `sinA`, `atanA`, etc. which take `Angle` as
+      input or output.
+
+* **New instances**
+
+    - `Transformable` instances for `LineWidth`, `Dashing`,
+      `LineTexture`, and  `FillTexture`.
+
+* **API changes**
+
+    - `FillColor` and `LineColor` attributes have been replaced with
+      the more general `FillTexture` and `LineTexture`. Use the `solid`
+      function to convert a color to a texture.
+
+    - The size of arrow heads and tails is now specified in terms of
+      length instead of the radius of their circumcircle.
+
+    - Gaps at the ends of arrows are now specified using `Measure R2`.
+
+    - The `gap` traversal has been replaced by `gaps` for consistency
+      in naming, though `gap` is still provided for backwards compatibility.
+
+    - `fontSize` now takes a value of type `Measure R2`.
+
+    - Get rid of (bitrotted) `Show` backend.
+
+    - Functions in `TwoD.Adjust` now return the adjustment
+      transformation itself in addition to the resized `Diagram` and
+      `Options` record; this can be used, *e.g.* to convert screen
+      coordinates back into diagram coordinates.
+
+    - Export `pathLocSegments`.
+
+    - The `avgScale` function has been moved to `Diagrams.Core`.
+
+    - The `Angle` definition and related functions (*e.g.*
+      `angleBetween`) have moved to a separate module, `Diagrams.Angle`.
+
+    - A separate `Diagrams.TwoD.Attributes` module now contains most
+      of the attributes that require 2D transformation instances.
+
+    - The `splitColorFills` function has been replaced by `splitTextureFills`.
+
+* **Dependency/version changes**
+
+  - Allow `semigroups-0.15`
+
+  - Allow `opt-parse-applicative-0.9.0
+
+  - Allow `lens-4.2`
+
 1.1.0.7 (15 May 2014)
 ------------------------
 

diagrams-lib.cabal

@@ -1,5 +1,5 @@
 Name:                diagrams-lib
-Version:             1.1.0.1
+Version:             1.2
 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
@@ -94,10 +94,10 @@ Library
   Build-depends:       base >= 4.2 && < 4.8,
                        containers >= 0.3 && < 0.6,
                        array >= 0.3 && < 0.6,
-                       semigroups >= 0.3.4 && < 0.15,
+                       semigroups >= 0.3.4 && < 0.16,
                        monoid-extras >= 0.3 && < 0.4,
                        dual-tree >= 0.2 && < 0.3,
-                       diagrams-core >= 1.1 && < 1.2,
+                       diagrams-core >= 1.2 && < 1.3,
                        active >= 0.1 && < 0.2,
                        vector-space >= 0.7.7 && < 0.9,
                        vector-space-points >= 0.1.2 && < 0.3,
@@ -106,14 +106,15 @@ Library
                        data-default-class < 0.1,
                        fingertree >= 0.1 && < 0.2,
                        intervals >= 0.7 && < 0.8,
-                       lens >= 4.0 && < 4.2,
+                       lens >= 4.0 && < 4.3,
                        tagged >= 0.7,
-                       optparse-applicative >= 0.7 && < 0.9,
+                       optparse-applicative >= 0.7 && < 0.10,
                        filepath,
                        safe >= 0.2 && < 0.4,
                        JuicyPixels >= 3.1.5 && < 3.2,
                        hashable >= 1.1 && < 1.3
   if impl(ghc < 7.6)
     Build-depends: ghc-prim
   Hs-source-dirs:      src
+  ghc-options: -Wall
   default-language:    Haskell2010