Chart-diagrams 1.2.2 → 1.2.3

raw patch · 2 files changed

+12/−12 lines, 2 filesdep ~diagrams-coredep ~diagrams-libdep ~diagrams-svg

Dependency ranges changed: diagrams-core, diagrams-lib, diagrams-svg, lens

Files

• Chart-diagrams.cabal +5/−5
• Graphics/Rendering/Chart/Backend/Diagrams.hs +7/−7

@@ -1,5 +1,5 @@ Name: Chart-diagrams-Version: 1.2.2+Version: 1.2.3 License: BSD3 License-file: LICENSE Copyright: Jan Bracker, 2006-2010@@ -28,9 +28,9 @@   Build-depends: base >= 3 && < 5                , old-locale                , time, mtl-               , diagrams-core >= 1.1 && < 1.2-               , diagrams-lib >= 1.1 && < 1.2-               , diagrams-svg >= 0.8 && < 1.2+               , 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                , colour >= 2.2.1 && < 2.4@@ -39,7 +39,7 @@                , operational >= 0.2.2 && < 0.3                , containers >= 0.4 && < 0.6                , data-default-class < 0.1-               , lens >= 3.9 && < 4.2+               , lens >= 3.9 && < 4.3                , Chart >= 1.2 && < 1.3                , text   other-modules: Paths_Chart_diagrams

@@ -606,26 +606,26 @@         )  -- | Apply the Chart line style to a diagram.-applyLineStyle :: (D.HasStyle a) => LineStyle -> a -> a-applyLineStyle ls = D.lineWidth (_line_width ls) +applyLineStyle :: (D.V a ~ R2, D.HasStyle a) => LineStyle -> a -> a+applyLineStyle ls = D.lineWidth (D.Global $ _line_width ls)                   . D.lineColor (_line_color ls)                    . D.lineCap (convertLineCap $ _line_cap ls)                    . D.lineJoin (convertLineJoin $ _line_join ls) -                  . D.dashing (_line_dashes ls) 0+                  . D.dashing (map D.Global $ _line_dashes ls) (D.Global 0)  -- | Apply the Chart fill style to a diagram.-applyFillStyle :: (D.HasStyle a) => FillStyle -> a -> a+applyFillStyle :: (D.V a ~ R2, D.HasStyle a) => FillStyle -> a -> a applyFillStyle fs = case fs of   FillStyleSolid cl -> D.fillColor cl  -- | Apply all pure diagrams properties from the font style.-applyFontStyleSVG :: (D.HasStyle a) => FontStyle -> a -> a+applyFontStyleSVG :: (D.V a ~ R2, D.HasStyle a) => FontStyle -> a -> a applyFontStyleSVG fs = applyLineStyle noLineStyle                       . applyFillStyle (solidFillStyle $ _font_color fs) -applyFontStyleText :: (D.HasStyle a) => FontStyle -> a -> a+applyFontStyleText :: (D.V a ~ R2, D.HasStyle a) => FontStyle -> a -> a applyFontStyleText fs = D2.font (_font_name fs)-                      . D2.fontSize (_font_size fs)+                      . D2.fontSize (D.Global $ _font_size fs)                       . D2.fontSlant (convertFontSlant $ _font_slant fs)                       . D2.fontWeight (convertFontWeight $ _font_weight fs)                       . D.fillColor (_font_color fs)