music-parts 1.6 → 1.6.1
raw patch · 2 files changed
+121/−54 lines, 2 files
Files
- music-parts.cabal +30/−33
- src/Music/Parts.hs +91/−21
music-parts.cabal view
@@ -1,42 +1,39 @@ -name: music-parts-version: 1.6-cabal-version: >= 1.10-author: Hans Hoglund-maintainer: Hans Hoglund-license: BSD3-license-file: COPYING-synopsis: To be written.-category: Music-tested-with: GHC-build-type: Simple+name: music-parts+version: 1.6.1+author: Hans Hoglund+maintainer: Hans Hoglund+license: BSD3+license-file: COPYING+synopsis: To be written.+category: Music+tested-with: GHC+build-type: Simple+cabal-version: >= 1.10 description: Abstract representation of musical parts and instruments.-+ . This library is part of the Music Suite, see <http://music-suite.github.io>. source-repository head- type: git- location: git://github.com/music-suite/music-parts.git+ type: git+ location: git://github.com/music-suite/music-parts.git library - build-depends: - base >= 4 && < 5,- time,- random,- semigroups,- semigroupoids,- data-default,- roman-numerals-- hs-source-dirs: src- default-language: Haskell2010- exposed-modules:- Music.Parts- -- Music.Parts.Strings- -- Music.Parts.Woodwind- -- Music.Parts.Brass- -- Music.Parts.Percussion- -- Music.Parts.Rhythm- -- Music.Parts.Other+ build-depends: base >= 4 && < 5,+ time,+ random,+ semigroups,+ semigroupoids,+ data-default,+ roman-numerals+ exposed-modules: Music.Parts+ -- Music.Parts.Strings+ -- Music.Parts.Woodwind+ -- Music.Parts.Brass+ -- Music.Parts.Percussion+ -- Music.Parts.Rhythm+ -- Music.Parts.Other+ hs-source-dirs: src+ default-language: Haskell2010
src/Music/Parts.hs view
@@ -43,23 +43,57 @@ tutti, -- ** Instruments etc+ piccoloFlute, flute,+ altoFlute,+ bassFlute,+ oboe, corAnglais,+ heckelphone,+ + ebClarinet, clarinet,+ aClarinet,+ bassClarinet,++ sopranoSax,+ altoSax,+ tenorSax,+ baritoneSax,+ bassoon,- frenchHorn,+ contraBassoon,+ + horn,+ piccoloTrumpet, trumpet,+ bassTrumpet,+ altoTrombone,+ tenorTrombone, trombone,+ bassTrombone, tuba,+ timpani, piano, + celesta,+ glockenspiel,+ vibraphone,+ marimba,+ xylophone,+ xylorimba,+ tubularBells,+ dulcimer,+ + accordion,+ harmonica,+ violin, viola, cello,- bass,- tubularBells,+ doubleBass, -- ** Default values defaultClef,@@ -219,27 +253,63 @@ containsSubpart :: Subpart -> Subpart -> Bool Subpart x `containsSubpart` Subpart y = y `Data.List.isPrefixOf` x -solo instr = Part Solo instr def-tutti instr = Part Tutti instr def+solo instr = Part Solo instr def+tutti instr = Part Tutti instr def -flute = StdInstrument 73-oboe = StdInstrument 68-corAnglais = StdInstrument 69-clarinet = StdInstrument 71-bassoon = StdInstrument 70-frenchHorn = StdInstrument 60-trumpet = StdInstrument 56-trombone = StdInstrument 57-tuba = StdInstrument 58-timpani = StdInstrument 47-piano = StdInstrument 0 -violin = StdInstrument 40-viola = StdInstrument 41-cello = StdInstrument 42-bass = StdInstrument 43+piccoloFlute = StdInstrument 72+flute = StdInstrument 73+altoFlute = OtherInstrument "Woodwind.Flute.Alto"+bassFlute = OtherInstrument "Woodwind.Flute.Bass" -tubularBells = StdInstrument 14+oboe = StdInstrument 68+corAnglais = StdInstrument 69+heckelphone = OtherInstrument "Woodwind.DoubleReed.Heckelphone"++ebClarinet = OtherInstrument "Woodwind.SingleReed.Clarinet.Eb"+clarinet = StdInstrument 71+aClarinet = OtherInstrument "Woodwind.SingleReed.Clarinet.A"+bassClarinet = OtherInstrument "Woodwind.SingleReed.Clarinet.Bass"++sopranoSax = StdInstrument 64+altoSax = StdInstrument 65+tenorSax = StdInstrument 66+baritoneSax = StdInstrument 67++bassoon = StdInstrument 70+contraBassoon = OtherInstrument "Woodwind.DoubleReed.Bassoon.Contra"++horn = StdInstrument 60+piccoloTrumpet = OtherInstrument "Brass.Trumpet.Piccolo"+trumpet = StdInstrument 56+bassTrumpet = OtherInstrument "Brass.Trumpet.Bass"+altoTrombone = OtherInstrument "Brass.Trombone.Alto"+tenorTrombone = StdInstrument 57+trombone = StdInstrument 57+bassTrombone = OtherInstrument "Brass.Trombone.Bass"+tuba = StdInstrument 58++timpani = StdInstrument 47+piano = StdInstrument 0++celesta = StdInstrument 8+glockenspiel = StdInstrument 9+vibraphone = StdInstrument 11+marimba = StdInstrument 12+xylophone = StdInstrument 13+xylorimba = OtherInstrument "Percussion.Pitched.Xylorimba"+tubularBells = StdInstrument 14+dulcimer = StdInstrument 15++accordion = StdInstrument 21+harmonica = StdInstrument 22++violin = StdInstrument 40+viola = StdInstrument 41+cello = StdInstrument 42+doubleBass = StdInstrument 43++ defaultClef :: Part -> Int defaultMidiNote :: Part -> Int