med-module 0.1.2.2 → 0.1.2.3
raw patch · 3 files changed
+35/−23 lines, 3 filesdep +hcg-minusdep ~hpsdep ~optparse-applicativePVP ok
version bump matches the API change (PVP)
Dependencies added: hcg-minus
Dependency ranges changed: hps, optparse-applicative
API changes (from Hackage documentation)
Files
- cabal.project.local +9/−0
- example/Animate.hs +16/−18
- med-module.cabal +10/−5
+ cabal.project.local view
@@ -0,0 +1,9 @@+-- packages:+-- ~/programming/haskell-other/postscript-git+-- ~/programming/haskell-other/hcg-minus+-- ~/programming/haskell-other/hmt-base+++flags: +buildExamples+-- with-compiler: ghc-9.4.5+-- ghc-options: -j3
example/Animate.hs view
@@ -11,8 +11,8 @@ import Sound.MED.Generic.Block(Note,Inst,Cmd,Val) import Sound.MED.Basic.Human(human) -import qualified Graphics.PS as PS-import Graphics.PS ((+++))+import qualified Graphics.Ps as PS+import Data.Cg.Minus (Pt(Pt)) import qualified Data.Array as Array import qualified Data.Foldable as Fold@@ -27,7 +27,7 @@ import Data.Maybe (fromMaybe, isJust) import Data.Tuple.HT (mapSnd, fst3, thd3) import Text.Printf (printf)-import Data.Monoid (Any(Any,getAny))+import Data.Monoid (Any(Any,getAny), (<>)) import qualified Control.Monad.Trans.Writer as MW import qualified Control.Monad.Trans.Class as MT@@ -292,30 +292,28 @@ barBorderV = 3 postR = fromIntegral post preR = fromIntegral pre- mmFromPt :: Double -> Int- mmFromPt pt = round $ pt / PS.mm_pt 1- in PS.ps path (PS.Paper (mmFromPt width) (mmFromPt height)) $+ in PS.ps path (PS.Paper PS.Pts (round width) (round height)) $ map (\(brightness,block) ->- flip PS.over- (PS.Fill (PS.greyGS brightness) $- PS.rectangle (PS.Pt 0 0) width height) $- foldr PS.over- (PS.Fill (PS.greyGS (0.8*brightness))+ flip (<>)+ (PS.Fill (PS.greyGs brightness) $+ PS.rectangle (Pt 0 0) width height) $+ foldr (<>)+ (PS.Fill (PS.greyGs (0.8*brightness)) (PS.rectangle- (PS.Pt (left-barBorderH) (top-preR*fontHeight-barBorderV))+ (Pt (left-barBorderH) (top-preR*fontHeight-barBorderV)) (barWidth $ length $ snd $ block!!pre) fontHeight)) $ zipWith (\y ((highlight,endOfBlock),line) -> let fontName = Option.fontName font ++ Mn.when highlight "-Bold" hline =- PS.Stroke (PS.greyGS 0) $- PS.line [PS.Pt (left-barBorderH) (y-barBorderV),- PS.Pt (left-barBorderH+barWidth(length line))+ PS.Stroke (PS.greyGs 0) $+ PS.line [Pt (left-barBorderH) (y-barBorderV),+ Pt (left-barBorderH+barWidth(length line)) (y-barBorderV)]- in (if endOfBlock then PS.over hline else id) $- (PS.Fill (PS.greyGS 0) $- PS.MoveTo (PS.Pt left y) ++++ in (if endOfBlock then (<>) hline else id) $+ (PS.Fill (PS.greyGs 0) $+ PS.MoveTo (Pt left y) <> PS.Text (PS.Font fontName fontHeight) line)) (iterate (subtract fontHeight) top) block) blocks
med-module.cabal view
@@ -1,5 +1,5 @@ Name: med-module-Version: 0.1.2.2+Version: 0.1.2.3 Synopsis: Parse song module files from Amiga MED and OctaMED Description: MED (Music EDitor) and its successor OctaMED@@ -25,11 +25,15 @@ Maintainer: haskell@henning-thielemann.de Category: Sound Build-Type: Simple-Extra-Source-Files: README.md, Makefile, src/Sound/MED/modules.sh+Extra-Source-Files:+ README.md+ Makefile+ src/Sound/MED/modules.sh+ cabal.project.local Cabal-Version: >=1.10 Source-Repository this- Tag: 0.1.2.2+ Tag: 0.1.2.3 Type: darcs Location: https://hub.darcs.net/thielema/med-module @@ -122,8 +126,9 @@ If flag(buildExamples) Build-Depends: med-module,- hps >=0.15 && <0.16,- optparse-applicative >=0.11 && <0.18,+ hps >=0.21 && <0.22,+ hcg-minus >=0.21 && <0.22,+ optparse-applicative >=0.11 && <0.19, filepath >=1.3 && <1.5, array >=0.4 && <0.6, transformers >=0.3 && <0.7,