Merge pull request #82 from diagrams/coordinates-noexp

Stop exporting Diagrams.Coordinates from Diagrams.Prelude

src/Diagrams/Coordinates.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE TypeFamilies  #-}
 {-# LANGUAGE TypeOperators #-}
 -----------------------------------------------------------------------------
 -- |
@@ -10,6 +10,11 @@
 -- Nice syntax for constructing and pattern-matching on literal
 -- points and vectors.
 --
+-- NOTE: to avoid clashing with the '(&)' operator from the @lens@
+-- package, this module is not re-exported by "Diagrams.Prelude".  To
+-- make use of the contents of this module, you must explicitly import
+-- it.
+--
 -----------------------------------------------------------------------------
 
 module Diagrams.Coordinates

src/Diagrams/Prelude.hs

@@ -20,10 +20,6 @@ module Diagrams.Prelude
 
          -- * Standard library
 
-         -- | Nice syntax for constructing and pattern-matching
-         --   literal points and vectors.
-       , module Diagrams.Coordinates
-
          -- | Attributes (color, line style, etc.) and styles.
        , module Diagrams.Attributes
 

src/Diagrams/TwoD/Types.hs

@@ -54,6 +54,9 @@ import           Data.Typeable
 -- > r2 (3,4) :: R2
 -- > 3 & 4    :: R2
 --
+--     Note that "Diagrams.Coordinates" is not re-exported by
+--     "Diagrams.Prelude" and must be explicitly imported.
+--
 --   * To construct the vector from the origin to a point @p@, use
 --     @p 'Data.AffineSpace..-.' 'origin'@.
 --