move V and Transformable instances for Measure to -core; Measure now …

…takes a vector type

src/Diagrams/TwoD/Arrow.hs

@@ -284,7 +284,7 @@ tailSty opts = fc black (opts^.tailStyle)
 
 
 -- | Radius of a circumcircle around the head.
-newtype HeadSize = HeadSize (Last (Measure Double))
+newtype HeadSize = HeadSize (Last (Measure R2))
                  deriving (Typeable, Data, Semigroup)
 instance AttributeClass HeadSize
 
@@ -299,16 +299,16 @@ instance Default HeadSize where
     def = HeadSize (Last (Output 20))
 
 -- | Set the radius of the circumcircle around the head.
-headSize :: (HasStyle a, V a ~ R2) => Measure Double -> a -> a
+headSize :: (HasStyle a, V a ~ R2) => Measure R2 -> a -> a
 headSize = applyGTAttr . HeadSize . Last
 
 headSizeA :: (HasStyle a, V a ~ R2) => HeadSize -> a -> a
 headSizeA = applyGTAttr
 
-getHeadSize :: HeadSize -> Measure Double
+getHeadSize :: HeadSize -> Measure R2
 getHeadSize (HeadSize (Last s)) = s
 
-newtype TailSize = TailSize (Last (Measure Double))
+newtype TailSize = TailSize (Last (Measure R2))
                  deriving (Typeable, Data, Semigroup)
 instance AttributeClass TailSize
 
@@ -323,13 +323,13 @@ instance Default TailSize where
     def = TailSize (Last (Output 20))
 
 -- | Set the radius of a circumcircle around the arrow tail.
-tailSize :: (HasStyle a, V a ~ R2) => Measure Double -> a -> a
+tailSize :: (HasStyle a, V a ~ R2) => Measure R2 -> a -> a
 tailSize = applyGTAttr . TailSize . Last
 
 tailSizeA :: (HasStyle a, V a ~ R2) => TailSize -> a -> a
 tailSizeA = applyGTAttr
 
-getTailSize :: TailSize -> Measure Double
+getTailSize :: TailSize -> Measure R2
 getTailSize (TailSize (Last s)) = s
 
 -- | Calculate the length of the portion of the horizontal line that passes

src/Diagrams/TwoD/Attributes.hs

@@ -46,7 +46,7 @@ import           Diagrams.TwoD.Types
 
 -- | Line widths specified on child nodes always override line widths
 --   specified at parent nodes.
-newtype LineWidth = LineWidth (Last (Measure Double))
+newtype LineWidth = LineWidth (Last (Measure R2))
   deriving (Typeable, Data, Semigroup)
 instance AttributeClass LineWidth
 
@@ -59,11 +59,11 @@ instance Transformable LineWidth where
 instance Default LineWidth where
     def = LineWidth (Last (Output 1))
 
-getLineWidth :: LineWidth -> Measure Double
+getLineWidth :: LineWidth -> Measure R2
 getLineWidth (LineWidth (Last w)) = w
 
 -- | Set the line (stroke) width.
-lineWidth :: (HasStyle a, V a ~ R2) => (Measure Double) -> a -> a
+lineWidth :: (HasStyle a, V a ~ R2) => Measure R2 -> a -> a
 lineWidth = applyGTAttr . LineWidth . Last
 
 -- | Apply a 'LineWidth' attribute.
@@ -101,7 +101,7 @@ veryThick = lwO 5
 -----------------------------------------------------------------
 
 -- | Create lines that are dashing... er, dashed.
-data Dashing = Dashing [Measure Double] (Measure Double)
+data Dashing = Dashing [Measure R2] (Measure R2)
   deriving (Typeable, Data, Eq)
 
 newtype DashingA = DashingA (Last Dashing)
@@ -122,11 +122,11 @@ getDashing (DashingA (Last d)) = d
 
 -- | Set the line dashing style.
 setDashing :: (HasStyle a, V a ~ R2) =>
-           [Measure Double]  -- ^ A list specifying alternate lengths of on
-                     --   and off portions of the stroke.  The empty
-                     --   list indicates no dashing.
-        -> Measure Double    -- ^ An offset into the dash pattern at which the
-                     --   stroke should start.
+           [Measure R2]  -- ^ A list specifying alternate lengths of on
+                         --   and off portions of the stroke.  The empty
+                         --   list indicates no dashing.
+        -> Measure R2    -- ^ An offset into the dash pattern at which the
+                         --   stroke should start.
         -> a -> a
 setDashing ds offs = applyGTAttr (DashingA (Last (Dashing ds offs)))
 

src/Diagrams/TwoD/Text.hs

@@ -37,10 +37,10 @@ import           Diagrams.Core.Envelope (pointEnvelope)
 import           Diagrams.TwoD.Types
 
 import           Data.AffineSpace       ((.-.))
-import           Data.Semigroup
 import           Data.Colour
 import           Data.Data
 import           Data.Default.Class
+import           Data.Semigroup
 
 ------------------------------------------------------------
 -- Text diagrams
@@ -162,7 +162,7 @@ font = applyAttr . Font . Last
 
 -- | The @FontSize@ attribute specifies the size of a font's
 --   em-square.  Inner @FontSize@ attributes override outer ones.
-newtype FontSize = FontSize (Last (Measure Double))
+newtype FontSize = FontSize (Last (Measure R2))
   deriving (Typeable, Data, Semigroup)
 instance AttributeClass FontSize
 
@@ -176,13 +176,13 @@ instance Transformable FontSize where
     FontSize (Last (transform t s))
 
 -- | Extract the size from a @FontSize@ attribute.
-getFontSize :: FontSize -> Measure Double
+getFontSize :: FontSize -> Measure R2
 getFontSize (FontSize (Last s)) = s
 
 -- | Set the font size, that is, the size of the font's em-square as
 --   measured within the current local vector space.  The default size
 --   is @1@.
-setFontSize :: (HasStyle a, V a ~ R2) => Measure Double -> a -> a
+setFontSize :: (HasStyle a, V a ~ R2) => Measure R2 -> a -> a
 setFontSize = applyGTAttr . FontSize . Last
 
 -- | A convenient synonym for 'setFontSize (Global w)'.

src/Diagrams/TwoD/Types.hs

@@ -244,11 +244,3 @@ instance HasR P2 where
 
 instance HasTheta P2 where
     _theta = _relative origin . _theta
-
------------------------------------------------------------------
-
-type instance V (Measure Double) = R2
-
-instance Transformable (Measure Double) where
-  transform tr (Local x) = Local (avgScale tr * x)
-  transform _ y = y