diff --git a/music-graphics.cabal b/music-graphics.cabal --- a/music-graphics.cabal +++ b/music-graphics.cabal @@ -1,6 +1,6 @@ name: music-graphics -version: 1.7 +version: 1.7.1 author: Hans Hoglund maintainer: Hans Hoglund license: BSD3 @@ -21,16 +21,15 @@ library build-depends: base >= 4 && < 5, - diagrams-core >= 0.6, - diagrams-svg >= 0.6, + aeson >= 0.7.0.6 && < 1, + lens >= 4.3 && < 4.4, + -- diagrams-svg >= 1.1 && < 2, bytestring, blaze-svg, - process, - lens >= 4.1.2 && < 4.2, - music-preludes == 1.7, - music-score == 1.7, - music-pitch == 1.7, - diagrams-lib >= 0.6 + process >= 1.2 && < 1.3, + music-preludes == 1.7.1, + music-score == 1.7.1, + music-pitch == 1.7.1 exposed-modules: Music.Graphics Music.Graphics.Diagrams hs-source-dirs: src diff --git a/src/Music/Graphics/Diagrams.hs b/src/Music/Graphics/Diagrams.hs --- a/src/Music/Graphics/Diagrams.hs +++ b/src/Music/Graphics/Diagrams.hs @@ -7,17 +7,17 @@ -- openGraphic ) where -import Music.Score -import Music.Pitch -import Diagrams.Prelude hiding (Time, Duration) -import qualified Diagrams.Backend.SVG as SVG - --- test -import Music.Prelude.Basic -import Control.Lens -import System.Process -import Text.Blaze.Svg.Renderer.Utf8 (renderSvg) -import qualified Data.ByteString.Lazy as ByteString +-- import Music.Score +-- import Music.Pitch +-- import Diagrams.Prelude hiding (Time, Duration) +-- import qualified Diagrams.Backend.SVG as SVG +-- +-- -- test +-- import Music.Prelude.Basic +-- import Control.Lens +-- import System.Process +-- import Text.Blaze.Svg.Renderer.Utf8 (renderSvg) +-- import qualified Data.ByteString.Lazy as ByteString -- -- -- timeToDouble :: Time -> Double