music-preludes 1.8.1 → 1.9.0

raw patch · 6 files changed

+86/−52 lines, 6 filesdep ~averagedep ~lensdep ~lilypondPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: average, lens, lilypond, music-articulation, music-dynamics, music-dynamics-literal, music-parts, music-pitch, music-pitch-literal, music-score, musicxml2, vector-space, vector-space-points

API changes (from Hackage documentation)

Files

• examples/chopin.hs +29/−0
• examples/mozart.hs +28/−28
• music-preludes.cabal +19/−20
• src/Music/Prelude/CmdLine.hs +1/−1
• src/Music/Prelude/Instances.hs +8/−2
• src/Music/Prelude/Standard.hs +1/−1

@@ -0,0 +1,29 @@++import Music.Prelude++a___ = _8vb a__++rh = [((1/2) <-> (3/4),e)^.event,((3/4) <-> (15/16),cs')^.event,((15/16) <-> 1,d')^.event,(1 <-> (5/4),d)^.event,(1 <->+  (5/4),gs)^.event,(1 <-> (5/4),b)^.event,((5/4) <-> (3/2),d)^.event,((5/4) <-> (3/2),gs)^.event,((5/4) <->+  (3/2),b)^.event,((3/2) <-> 2,d)^.event,((3/2) <-> 2,gs)^.event,((3/2) <-> 2,b)^.event,(2 <-> (9/4),d')^.event,(2 <->+  (9/4),fs')^.event,((9/4) <-> (39/16),bs)^.event,((9/4) <-> (39/16),ds')^.event,((39/16) <-> (5/2),cs')^.event,((39/16) <->+  (5/2),e')^.event,((5/2) <-> (11/4),cs')^.event,((5/2) <-> (11/4),a')^.event,((11/4) <-> 3,cs')^.event,((11/4) <->+  3,a')^.event,(3 <-> (7/2),cs')^.event,(3 <-> (7/2),a')^.event,((7/2) <-> (15/4),e)^.event,((7/2) <->+  (15/4),cs')^.event,((15/4) <-> (63/16),cs)^.event,((15/4) <-> (63/16),as)^.event,((63/16) <-> 4,d)^.event,((63/16) <->+  4,b)^.event,(4 <-> (17/4),fs)^.event,(4 <-> (17/4),d')^.event,((17/4) <-> (9/2),fs)^.event,((17/4) <->+  (9/2),d')^.event,((9/2) <-> 5,fs)^.event,((9/2) <-> 5,d')^.event,(5 <-> (21/4),d)^.event,(5 <-> (21/4),gs)^.event,((21/4)+  <-> (87/16),d)^.event,((21/4) <-> (87/16),gs)^.event,((87/16) <-> (11/2),cs)^.event,((87/16) <-> (11/2),a)^.event,((11/2)+  <-> (23/4),cs)^.event,((11/2) <-> (23/4),cs')^.event,((23/4) <-> 6,cs)^.event,((23/4) <-> 6,cs')^.event,(6 <->+  (13/2),cs)^.event,(6 <-> (13/2),cs')^.event]^.score++lh = [((3/4) <-> 1,e__)^.event,(1 <-> (5/4),e_)^.event,(1 <-> (5/4),e)^.event,((5/4) <-> (3/2),e_)^.event,((5/4) <->+  (3/2),e)^.event,((3/2) <-> 2,e_)^.event,((3/2) <-> 2,e)^.event,((9/4) <-> (5/2),a__)^.event,((5/2) <->+  (11/4),a_)^.event,((5/2) <-> (11/4),e)^.event,((11/4) <-> 3,a_)^.event,((11/4) <-> 3,e)^.event,(3 <-> (7/2),a_)^.event,(3+  <-> (7/2),e)^.event,((15/4) <-> 4,e__)^.event,(4 <-> (17/4),e_)^.event,(4 <-> (17/4),b_)^.event,((17/4) <->+  (9/2),e_)^.event,((17/4) <-> (9/2),b_)^.event,((9/2) <-> 5,e_)^.event,((9/2) <-> 5,b_)^.event,((21/4) <->+  (11/2),a___)^.event,((11/2) <-> (23/4),e_)^.event,((11/2) <-> (23/4),a_)^.event,((11/2) <-> (23/4),e)^.event,((23/4) <->+  6,e_)^.event,((23/4) <-> 6,a_)^.event,((23/4) <-> 6,e)^.event,(6 <-> (13/2),e_)^.event,(6 <-> (13/2),a_)^.event,(6 <->+  (13/2),e)^.event]^.score++music = timeSignature (3/4) $ lh </> rh+main = open music

@@ -39,37 +39,37 @@     stanza1_instr </> stanza1_voc  -- Rhythm helper functions-lss l s1 s2     = l^*2 |> s1 |> s2-ssl s1 s2 l     = s1 |> s2 |> l^*2+lss l s1 s2     = l|*2 |> s1 |> s2+ssl s1 s2 l     = s1 |> s2 |> l|*2 s3 s1 s2 s3     = s1 |> s2 |> s3 s4 s1 s2 s3 s4  = s1 |> s2 |> s3 |> s4-sl s l          = s |> l^*3-ls l s          = l^*3 |> s-fit2 x y        = (x |> y)^/2-l4 l            = l^*4-ll l1 l2        = (l1 |> l2)^*2+sl s l          = s |> l|*3+ls l s          = l|*3 |> s+fit2 x y        = (x |> y)|/2+l4 l            = l|*4+ll l1 l2        = (l1 |> l2)|*2 -a2  = a  ^* 2-as2 = as ^* 2-ab2 = ab ^* 2-b2  = b  ^* 2-bs2 = bs ^* 2-bb2 = bb ^* 2-c2  = c  ^* 2-cs2 = cs ^* 2-cb2 = cb ^* 2-d2  = d  ^* 2-ds2 = ds ^* 2-db2 = db ^* 2-e2  = e  ^* 2-es2 = es ^* 2-eb2 = eb ^* 2-f2  = f  ^* 2-fs2 = fs ^* 2-fb2 = fb ^* 2-g2  = g  ^* 2-gs2 = gs ^* 2-gb2 = gb ^* 2+a2  = a  |* 2+as2 = as |* 2+ab2 = ab |* 2+b2  = b  |* 2+bs2 = bs |* 2+bb2 = bb |* 2+c2  = c  |* 2+cs2 = cs |* 2+cb2 = cb |* 2+d2  = d  |* 2+ds2 = ds |* 2+db2 = db |* 2+e2  = e  |* 2+es2 = es |* 2+eb2 = eb |* 2+f2  = f  |* 2+fs2 = fs |* 2+fb2 = fb |* 2+g2  = g  |* 2+gs2 = gs |* 2+gb2 = gb |* 2 (//) = (|>)  {-

@@ -1,6 +1,6 @@  name:                   music-preludes-version:                1.8.1+version:                1.9.0 author:                 Hans Hoglund maintainer:             Hans Hoglund license:                BSD3@@ -25,30 +25,29 @@   location:             git://github.com/music-suite/music-preludes.git  library-    build-depends:      base                    >= 4 && < 5,-                        -- aeson                   >= 0.7.0.6 && < 1,-                        lens                    >= 4.6 && < 4.7,+    build-depends:      base                    >= 4        && < 5,+                        lens                    >= 4.11     && < 5,                         split,                         containers,-                        vector-space            >= 0.8.7 && < 0.9,-                        vector-space-points     >= 0.2 && < 0.3,-                        process                 >= 1.2 && < 1.3,-                        filepath                >= 1.3  && < 2,-                        temporary               >= 1.1  && < 2,-                        optparse-applicative    >= 0.8  && < 1,-                        average                 >= 0.6  && < 1,+                        vector-space            >= 0.10.2   && < 1,+                        vector-space-points     >= 0.2      && < 1,+                        process                 >= 1.2      && < 1.3,+                        filepath                >= 1.3      && < 2,+                        temporary               >= 1.1      && < 2,+                        optparse-applicative    >= 0.8      && < 1,+                        average                 >= 0.6.1    && < 1,                         semigroups              >= 0.13.0.1 && < 1,                         -- data-default,                         monadplus,-                        lilypond                == 1.8.1,-                        musicxml2               == 1.8.1,-                        music-score             == 1.8.1,-                        music-pitch             == 1.8.1,-                        music-dynamics          == 1.8.1,-                        music-articulation      == 1.8.1,-                        music-parts             == 1.8.1,-                        music-pitch-literal     == 1.8.1,-                        music-dynamics-literal  == 1.8.1,+                        lilypond                == 1.9.0,+                        musicxml2               == 1.9.0,+                        music-score             == 1.9.0,+                        music-pitch             == 1.9.0,+                        music-dynamics          == 1.9.0,+                        music-articulation      == 1.9.0,+                        music-parts             == 1.9.0,+                        music-pitch-literal     == 1.9.0,+                        music-dynamics-literal  == 1.9.0,                         -- For examples:                         async     if !os(windows)

@@ -58,7 +58,7 @@ #ifndef GHCI version = Paths.version #else-version = undefined+version = error "Could not get version" #endif  -- | Current Music Suite version as a string.

@@ -32,8 +32,8 @@ import           Music.Pitch import           Music.Score            hiding (Fifths, Interval, Note, Pitch) -import qualified Music.Lilypond         as Lilypond-import qualified Music.MusicXml.Simple  as Xml+import qualified Data.Music.Lilypond         as Lilypond+import qualified Data.Music.MusicXml.Simple  as Xml import qualified Music.Score            as Score  deriving instance Typeable Music.Parts.Part@@ -148,7 +148,13 @@  instance HasMusicXmlInstrument BasicPart where     getMusicXmlClef = 0+    getMusicXmlNumberOfStaves = 1  instance HasMusicXmlInstrument Music.Parts.Part where     getMusicXmlClef = defaultClef+    getMusicXmlNumberOfStaves p+      | p == harp                 = 2+      | p^._instrument == piano   = 2+      | p^._instrument == celesta = 2+      | otherwise                 = 1 

@@ -72,7 +72,7 @@               (ArticulationT Articulation                 (DynamicT Dynamics                   [TieT-                    (Behavior Pitch)]))))))))+                    Pitch]))))))))   open          = openLilypond . asScore