diagrams: Port to diagrams-1.3

timbod7 · Jun 1, 2015 · 6ba7cd4 · 6ba7cd4
1 parent 54432cb
commit 6ba7cd4
Show file tree

Hide file tree

Showing 8 changed files with 187 additions and 165 deletions.
diff --git a/chart-diagrams/Chart-diagrams.cabal b/chart-diagrams/Chart-diagrams.cabal
@@ -28,13 +28,14 @@ library
   Build-depends: base >= 3 && < 5
                , old-locale
                , time, mtl
-               , diagrams-core >= 1.2 && < 1.3
-               , diagrams-lib >= 1.2 && < 1.3
-               , diagrams-svg >= 1.1 && < 1.2
-               , diagrams-postscript >= 0.7 && < 1.2
-               , SVGFonts >= 1.4 && < 1.5
+               , diagrams-core >= 1.3 && < 1.4
+               , diagrams-lib >= 1.2 && < 1.4
+               , diagrams-svg >= 1.3.1 && < 1.4
+               , diagrams-postscript >= 0.7 && < 1.4
+               , SVGFonts >= 1.4 && < 1.6
                , colour >= 2.2.1 && < 2.4
-               , blaze-svg >= 0.3.3
+               , blaze-markup >= 0.7 && < 0.8
+               , lucid-svg >= 0.4 && < 0.5
                , bytestring >= 0.9 && < 1.0
                , operational >= 0.2.2 && < 0.3
                , containers >= 0.4 && < 0.6

diff --git a/chart-diagrams/Graphics/Rendering/Chart/Backend/Diagrams.hs b/chart-diagrams/Graphics/Rendering/Chart/Backend/Diagrams.hs
diff --git a/chart-tests/Chart-tests.cabal b/chart-tests/Chart-tests.cabal
@@ -28,7 +28,7 @@ Executable harness
       lens            >= 3.9 && < 4.12,
       data-default-class < 0.1,
       bytestring      >= 0.9 && < 1.0,
-      blaze-svg       >= 0.3.3,
+      lucid-svg       >= 0.3.3,
       random          >= 1.0,
       containers      >= 0.4 && <0.6,
       old-time        >= 1.0,
@@ -38,11 +38,11 @@ Executable harness
       Chart-diagrams  >= 1.3 && < 1.5,
       gtk             >= 0.9.11,
       cairo           >= 0.9.11,
-      diagrams-cairo  >= 1.2 && < 1.3,
-      diagrams-svg    >= 1.1 && < 1.2,
-      diagrams-postscript    >= 0.7 && < 1.2,
-      diagrams-lib    >= 1.2 && < 1.3,
-      diagrams-core   >= 1.2 && < 1.3
+      diagrams-cairo  >= 1.2 && < 1.4,
+      diagrams-svg    >= 1.1 && < 1.4,
+      diagrams-postscript    >= 0.7 && < 1.4,
+      diagrams-lib    >= 1.2 && < 1.4,
+      diagrams-core   >= 1.2 && < 1.4
   Main-is: Main.hs
   Hs-Source-Dirs: tests
   Ghc-Options: -threaded

diff --git a/chart-tests/tests/CompareFonts.hs b/chart-tests/tests/CompareFonts.hs
@@ -12,7 +12,7 @@ import qualified Graphics.Rendering.Chart.Backend.Diagrams as BD
 import qualified Graphics.Rendering.Chart.Backend.Cairo as BC
 
 import Diagrams.Core ( renderDia )
-import Diagrams.TwoD ( SizeSpec2D(..) )
+import Diagrams.Prelude ( dims, V2(..) )
 import Diagrams.Backend.Cairo hiding ( renderCairo )
 import Diagrams.Backend.Cairo.Internal
 
@@ -95,4 +95,4 @@ renderDiagramsCairo :: (Int, Int) -> ChartBackend () -> IO (C.Render ())
 renderDiagramsCairo (w,h) m = do
   env <- BD.defaultEnv bitmapAlignmentFns (fromIntegral w) (fromIntegral h)
   let (d, _) = BD.runBackend env m
-  return $ snd $ renderDia Cairo (CairoOptions "" (Dims (fromIntegral w) (fromIntegral h)) PNG True) d
+  return $ snd $ renderDia Cairo (CairoOptions "" (dims $ V2 (fromIntegral w) (fromIntegral h)) PNG True) d
diff --git a/chart-tests/tests/DiagramsCairo.hs b/chart-tests/tests/DiagramsCairo.hs
@@ -4,7 +4,7 @@ import Graphics.Rendering.Chart.Backend
 import Graphics.Rendering.Chart.Backend.Diagrams
 
 import Diagrams.Core ( renderDia )
-import Diagrams.TwoD ( SizeSpec2D(..) )
+import Diagrams.Prelude ( dims, V2(..) )
 import Diagrams.Backend.Cairo
 import Diagrams.Backend.Cairo.Internal
 import Graphics.Rendering.Chart.Renderable ( render, Renderable )
@@ -26,5 +26,5 @@ main1 args = do
       renderDiagram (n,(w,h),ir) = do
         let env' = env { envOutputSize = (fromIntegral w, fromIntegral h) }
             (d, _) = runBackendR env' (ir 1.0)
-        fst $ renderDia Cairo (CairoOptions (n ++ ".png") (Dims (fromIntegral w) (fromIntegral h)) PNG False) d
+        fst $ renderDia Cairo (CairoOptions (n ++ ".png") (dims $ V2 (fromIntegral w) (fromIntegral h)) PNG False) d
   showTests (fmap (\(x,_,_) -> x) allTests) renderDiagram
diff --git a/chart-tests/tests/DiagramsEPS.hs b/chart-tests/tests/DiagramsEPS.hs
@@ -4,7 +4,6 @@ import Graphics.Rendering.Chart.Backend
 import Graphics.Rendering.Chart.Backend.Diagrams
 
 import Diagrams.Core ( renderDia )
-import Diagrams.TwoD ( SizeSpec2D(..) )
 import Graphics.Rendering.Chart.Renderable ( render, Renderable )
 import qualified Diagrams.Backend.Postscript as DEPS
 
@@ -24,7 +23,7 @@ main1 args = do
     env0 <- defaultEnv bitmapAlignmentFns 0 0
     showTests (fmap (\(x,_,_) -> x) allTests) (renderDiagram env0)
   where
-    renderDiagram :: DEnv -> (String, (Int, Int), T.LineWidth -> Renderable ()) -> IO ()
+    renderDiagram :: DEnv Double -> (String, (Int, Int), T.LineWidth -> Renderable ()) -> IO ()
     renderDiagram env0 (n,(w,h),ir) = do
       let cr = render (ir 0.25) (fromIntegral w, fromIntegral h)
           env = env0{ envOutputSize = (fromIntegral w, fromIntegral h) }

diff --git a/chart-tests/tests/DiagramsSVG.hs b/chart-tests/tests/DiagramsSVG.hs
@@ -6,10 +6,9 @@ import Graphics.Rendering.Chart.Backend.Diagrams
 import qualified Data.ByteString.Lazy as BS
 
 import Diagrams.Core ( renderDia )
-import Diagrams.TwoD ( SizeSpec2D(..) )
 import Diagrams.Backend.SVG
 import Graphics.Rendering.Chart.Renderable ( render, Renderable )
-import Text.Blaze.Svg.Renderer.Utf8 ( renderSvg )
+import Lucid.Svg ( renderBS )
 
 import System.Environment ( getArgs )
 
@@ -27,11 +26,11 @@ main1 args = do
     env0 <- defaultEnv bitmapAlignmentFns 0 0
     showTests (fmap (\(x,_,_) -> x) allTests) (renderDiagram env0)
   where
-    renderDiagram :: DEnv -> (String, (Int, Int), T.LineWidth -> Renderable ()) -> IO ()
+    renderDiagram :: DEnv Double -> (String, (Int, Int), T.LineWidth -> Renderable ()) -> IO ()
     renderDiagram env0 (n,(w,h),ir) = do
       let cr = render (ir 0.25) (fromIntegral w, fromIntegral h)
           env = env0{ envOutputSize = (fromIntegral w, fromIntegral h) }
           (svg, _) = cBackendToSVG cr env
           path = n ++ ".svg"
       putStrLn (path ++ "...")
-      BS.writeFile path (renderSvg svg)
+      BS.writeFile path (renderBS svg)
diff --git a/chart-tests/tests/Drawing/DiagramsCairo.hs b/chart-tests/tests/Drawing/DiagramsCairo.hs
@@ -4,7 +4,7 @@ import Graphics.Rendering.Chart.Backend
 import Graphics.Rendering.Chart.Backend.Diagrams
 
 import Diagrams.Core ( renderDia )
-import Diagrams.TwoD ( SizeSpec2D(..) )
+import Diagrams.Prelude ( dims, V2(..) )
 import Diagrams.Backend.Cairo
 import Diagrams.Backend.Cairo.Internal
 
@@ -19,4 +19,4 @@ render :: FilePath -> Int -> Int -> ChartBackend a -> IO ()
 render f w h m = do
   env <- defaultEnv bitmapAlignmentFns (fromIntegral w) (fromIntegral h)
   let (d, _) = runBackend env m
-  fst $ renderDia Cairo (CairoOptions f (Dims (fromIntegral w) (fromIntegral h)) PNG False) d
+  fst $ renderDia Cairo (CairoOptions f (dims $ V2 (fromIntegral w) (fromIntegral h)) PNG False) d