musicality 0.8.0 → 0.9.0

data/spec/printing/score_engraver_spec.rb

@@ -0,0 +1,40 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe ScoreEngraver do
+  describe '.part_titles' do
+    context 'parts all have different lilypond settings' do
+      it 'should return a map of part names to instrument names' do
+        parts = { 
+          :part1 => Part.new(Dynamics::MP, settings: [ LilypondSettings::ELECTRIC_PIANO ]),
+          :part2 => Part.new(Dynamics::MP, settings: [ LilypondSettings::ELECTRIC_BASS ]),
+          :part3 => Part.new(Dynamics::MP, settings: [ LilypondSettings::CLARINET ])
+        }
+        titles = ScoreEngraver.figure_part_titles(parts)
+
+        parts.each do |part_name, part|
+          titles[part_name].should eq(part.lilypond_settings.instrument_name)
+        end
+      end
+    end
+
+    context 'some parts have same lilypond settings' do
+      it 'should return a map of part names to numbered instrument names' do
+        parts = { 
+          :part1 => Part.new(Dynamics::MP, settings: [ LilypondSettings::ELECTRIC_PIANO ]),
+          :part2 => Part.new(Dynamics::MP, settings: [ LilypondSettings::ELECTRIC_PIANO ]),
+          :part3 => Part.new(Dynamics::MP, settings: [ LilypondSettings::ELECTRIC_PIANO ])
+        }
+        titles = ScoreEngraver.figure_part_titles(parts)
+
+        part_nums = []
+        parts.each do |part_name, part|
+          r = Regexp.new("#{part.lilypond_settings.instrument_name} (\\d)")
+          titles[part_name].should match r
+          m = titles[part_name].match(r)
+          part_nums.push m.captures.first.to_s.to_i
+        end
+        part_nums.sort.should eq((1..part_nums.size).to_a)
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ include Musicality
 include Pitches
 include Meters
 include Articulations
+include Marks
 
 class Samples
   SAMPLE_PART = Part.new(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: musicality
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - James Tunnell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2016-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: ruby-osc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
 description: "The library is based around an abstract representation for music notation.
   \\\n                          From here, functions are built up to make composing
   elaborate pieces in this notation representation more manageable. \\\n                          Finally,
@@ -116,8 +130,10 @@ description: "The library is based around an abstract representation for music n
 email:
 - jamestunnell@gmail.com
 executables:
+- collidify
 - lilify
 - midify
+- musicality
 extensions: []
 extra_rdoc_files: []
 files:
@@ -129,23 +145,24 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/collidify
 - bin/lilify
 - bin/midify
+- bin/musicality
 - examples/composition/auto_counterpoint.rb
 - examples/composition/part_generator.rb
 - examples/composition/scale_exercise.rb
-- examples/notation/hip.rb
-- examples/notation/missed_connection.rb
-- examples/notation/song1.rb
-- examples/notation/song2.rb
+- examples/notation/notes.rb
+- examples/notation/parts.rb
+- examples/notation/scores.rb
+- examples/notation/twinkle.rb
+- examples/notation/twinkle.score
 - lib/musicality.rb
 - lib/musicality/composition/convenience_methods.rb
 - lib/musicality/composition/dsl/score_dsl.rb
 - lib/musicality/composition/dsl/score_methods.rb
 - lib/musicality/composition/generation/counterpoint_generator.rb
 - lib/musicality/composition/generation/random_rhythm_generator.rb
-- lib/musicality/composition/model/pitch_class.rb
-- lib/musicality/composition/model/pitch_classes.rb
 - lib/musicality/composition/model/scale.rb
 - lib/musicality/composition/model/scale_class.rb
 - lib/musicality/composition/model/scale_classes.rb
@@ -166,8 +183,13 @@ files:
 - lib/musicality/notation/model/articulations.rb
 - lib/musicality/notation/model/change.rb
 - lib/musicality/notation/model/dynamics.rb
+- lib/musicality/notation/model/instrument.rb
+- lib/musicality/notation/model/instruments.rb
+- lib/musicality/notation/model/key.rb
+- lib/musicality/notation/model/keys.rb
 - lib/musicality/notation/model/link.rb
-- lib/musicality/notation/model/links.rb
+- lib/musicality/notation/model/mark.rb
+- lib/musicality/notation/model/marks.rb
 - lib/musicality/notation/model/meter.rb
 - lib/musicality/notation/model/meters.rb
 - lib/musicality/notation/model/note.rb
@@ -176,9 +198,6 @@ files:
 - lib/musicality/notation/model/pitches.rb
 - lib/musicality/notation/model/score.rb
 - lib/musicality/notation/model/symbols.rb
-- lib/musicality/notation/packing/change_packing.rb
-- lib/musicality/notation/packing/part_packing.rb
-- lib/musicality/notation/packing/score_packing.rb
 - lib/musicality/notation/parsing/articulation_parsing.rb
 - lib/musicality/notation/parsing/articulation_parsing.treetop
 - lib/musicality/notation/parsing/convenience_methods.rb
@@ -188,6 +207,8 @@ files:
 - lib/musicality/notation/parsing/link_nodes.rb
 - lib/musicality/notation/parsing/link_parsing.rb
 - lib/musicality/notation/parsing/link_parsing.treetop
+- lib/musicality/notation/parsing/mark_parsing.rb
+- lib/musicality/notation/parsing/mark_parsing.treetop
 - lib/musicality/notation/parsing/meter_parsing.rb
 - lib/musicality/notation/parsing/meter_parsing.treetop
 - lib/musicality/notation/parsing/note_node.rb
@@ -216,26 +237,53 @@ files:
 - lib/musicality/notation/util/piecewise_function.rb
 - lib/musicality/notation/util/transition.rb
 - lib/musicality/notation/util/value_computer.rb
+- lib/musicality/packable.rb
 - lib/musicality/performance/conversion/glissando_converter.rb
 - lib/musicality/performance/conversion/note_sequence_extractor.rb
 - lib/musicality/performance/conversion/portamento_converter.rb
 - lib/musicality/performance/conversion/score_collator.rb
 - lib/musicality/performance/midi/midi_events.rb
+- lib/musicality/performance/midi/midi_settings.rb
 - lib/musicality/performance/midi/midi_util.rb
 - lib/musicality/performance/midi/part_sequencer.rb
 - lib/musicality/performance/midi/score_sequencer.rb
 - lib/musicality/performance/midi/score_sequencing.rb
-- lib/musicality/performance/model/note_attacks.rb
+- lib/musicality/performance/model/attack.rb
+- lib/musicality/performance/model/duration_functions.rb
 - lib/musicality/performance/model/note_sequence.rb
-- lib/musicality/performance/util/note_linker.rb
+- lib/musicality/performance/model/separation.rb
+- lib/musicality/performance/supercollider/add_actions.rb
+- lib/musicality/performance/supercollider/bundle.rb
+- lib/musicality/performance/supercollider/conductor.rb
+- lib/musicality/performance/supercollider/group.rb
+- lib/musicality/performance/supercollider/message.rb
+- lib/musicality/performance/supercollider/node.rb
+- lib/musicality/performance/supercollider/performer.rb
+- lib/musicality/performance/supercollider/score_conducting.rb
+- lib/musicality/performance/supercollider/server.rb
+- lib/musicality/performance/supercollider/synth.rb
+- lib/musicality/performance/supercollider/synthdef.rb
+- lib/musicality/performance/supercollider/synthdef_settings.rb
+- lib/musicality/performance/supercollider/synthdefs.rb
 - lib/musicality/performance/util/optimization.rb
+- lib/musicality/pitch_class.rb
+- lib/musicality/pitch_classes.rb
+- lib/musicality/printing/lilypond/clef.rb
 - lib/musicality/printing/lilypond/errors.rb
+- lib/musicality/printing/lilypond/key_engraving.rb
+- lib/musicality/printing/lilypond/lilypond_settings.rb
 - lib/musicality/printing/lilypond/meter_engraving.rb
 - lib/musicality/printing/lilypond/note_engraving.rb
 - lib/musicality/printing/lilypond/part_engraver.rb
+- lib/musicality/printing/lilypond/pitch_class_engraving.rb
 - lib/musicality/printing/lilypond/pitch_engraving.rb
 - lib/musicality/printing/lilypond/score_engraver.rb
 - lib/musicality/printing/lilypond/score_engraving.rb
+- lib/musicality/project/create_tasks.rb
+- lib/musicality/project/file_cleaner.rb
+- lib/musicality/project/file_raker.rb
+- lib/musicality/project/load_config.rb
+- lib/musicality/project/project.rb
 - lib/musicality/validatable.rb
 - lib/musicality/version.rb
 - musicality.gemspec
@@ -259,15 +307,13 @@ files:
 - spec/notation/conversion/score_converter_spec.rb
 - spec/notation/conversion/tempo_conversion_spec.rb
 - spec/notation/model/change_spec.rb
+- spec/notation/model/key_spec.rb
 - spec/notation/model/link_spec.rb
 - spec/notation/model/meter_spec.rb
 - spec/notation/model/note_spec.rb
 - spec/notation/model/part_spec.rb
 - spec/notation/model/pitch_spec.rb
 - spec/notation/model/score_spec.rb
-- spec/notation/packing/change_packing_spec.rb
-- spec/notation/packing/part_packing_spec.rb
-- spec/notation/packing/score_packing_spec.rb
 - spec/notation/parsing/articulation_parsing_spec.rb
 - spec/notation/parsing/convenience_methods_spec.rb
 - spec/notation/parsing/duration_nodes_spec.rb
@@ -298,8 +344,9 @@ files:
 - spec/performance/midi/score_sequencer_spec.rb
 - spec/performance/midi/score_sequencing_spec.rb
 - spec/performance/model/note_sequence_spec.rb
-- spec/performance/util/note_linker_spec.rb
 - spec/performance/util/optimization_spec.rb
+- spec/printing/note_engraving_spec.rb
+- spec/printing/score_engraver_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/jamestunnell/musicality
 licenses:
@@ -313,7 +360,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -346,15 +393,13 @@ test_files:
 - spec/notation/conversion/score_converter_spec.rb
 - spec/notation/conversion/tempo_conversion_spec.rb
 - spec/notation/model/change_spec.rb
+- spec/notation/model/key_spec.rb
 - spec/notation/model/link_spec.rb
 - spec/notation/model/meter_spec.rb
 - spec/notation/model/note_spec.rb
 - spec/notation/model/part_spec.rb
 - spec/notation/model/pitch_spec.rb
 - spec/notation/model/score_spec.rb
-- spec/notation/packing/change_packing_spec.rb
-- spec/notation/packing/part_packing_spec.rb
-- spec/notation/packing/score_packing_spec.rb
 - spec/notation/parsing/articulation_parsing_spec.rb
 - spec/notation/parsing/convenience_methods_spec.rb
 - spec/notation/parsing/duration_nodes_spec.rb
@@ -385,6 +430,7 @@ test_files:
 - spec/performance/midi/score_sequencer_spec.rb
 - spec/performance/midi/score_sequencing_spec.rb
 - spec/performance/model/note_sequence_spec.rb
-- spec/performance/util/note_linker_spec.rb
 - spec/performance/util/optimization_spec.rb
+- spec/printing/note_engraving_spec.rb
+- spec/printing/score_engraver_spec.rb
 - spec/spec_helper.rb

data/examples/notation/hip.rb

@@ -1,32 +0,0 @@
-require 'musicality'
-require 'yaml'
-
-include Musicality
-include Pitches
-include Articulations
-include Meters
-
-score = Score::Measured.new(FOUR_FOUR,120) do |s|
-  s.program += [0...2, 0...2, 2...4, 0...2]
-  s.parts["lead"] = Part.new(Dynamics::MF) do |p|
-    riff = "/6Bb3 /4 /12Db4= /6Db4= /36Db4 /36Eb4 /36Db4 /6Ab3 /12Db4 \
-            /6Bb3 /4 /12Db4= /4Db4=                      /8=Db4 /8C4".to_notes
-    p.notes = riff + riff.map {|n| n.transpose(2) }
-  end
-  
-  s.parts["bass"] = Part.new(Dynamics::MP) do |p|
-    riff = "/6Bb2 /4 /3Ab2 /6F2 /12Ab2 \
-            /6Bb2 /4 /3Ab2 /4Ab2".to_notes
-    p.notes = riff + riff.map {|n| n.transpose(2) }
-  end
-end
-
-name = File.basename(__FILE__,".rb")
-
-File.open("#{name}.yml", "w") do |file|
-  file.write score.to_yaml
-end
-
-File.open("#{name}_packed.yml", "w") do |file|
-  file.write score.pack.to_yaml
-end

data/examples/notation/missed_connection.rb

@@ -1,26 +0,0 @@
-require 'musicality'
-require 'yaml'
-
-include Musicality
-include Pitches
-include Articulations
-include Meters
-
-score = Score::Measured.new(FOUR_FOUR, 120) do |s|
-  s.program += [0...2, 0...6]
-  s.parts["bass"] = Part.new(Dynamics::MF) do |p|
-    p.notes =  "/4Eb2 /4 /4Bb2 /4 /4Eb2 /8 /8B2 /4Bb2 /4Ab2".to_notes
-    p.notes += "/4Bb2 /8 /8F3= /2F3 /4Bb2 /8 /8F3= /2F3".to_notes
-    p.notes += "/4B2 /8 /8Gb3= /2Gb3 /8 /8Gb3= /2Gb3".to_notes
-  end
-end
-
-name = File.basename(__FILE__,".rb")
-
-File.open("#{name}.yml", "w") do |file|
-  file.write score.to_yaml
-end
-
-File.open("#{name}_packed.yml", "w") do |file|
-  file.write score.pack.to_yaml
-end

data/examples/notation/song1.rb

@@ -1,33 +0,0 @@
-require 'musicality'
-require 'yaml'
-
-include Musicality
-include Pitches
-include Articulations
-include Meters
-
-score = Score::Measured.new(FOUR_FOUR, 120) do |s|
-  s.program += [0...4]*2
-  
-  s.parts[1] = Part.new(Dynamics::MF) do |p|
-    p.notes = "3/8C2 /4Eb2 5/16F2 /16Eb2 \
-               /8 /4C2 /4Eb2 3/8 \
-               3/8C2 /4Eb2 5/16F2 /16Eb2 \
-               /8 /4C2 /4Eb2".to_notes
-  end
-  
-  s.parts[2] = Part.new(Dynamics::MF) do |p|
-    p.notes = "/8 /8Bb3 /8Bb3 /8Bb3 /8Bb3 /4C4 /4A3 /8G3 /8F3 5/16=G3 /16=F3 /8E3 /8 \
-               /8 /8Bb3 /8Bb3 /8Bb3 /8Bb3 /4C4 /8A3 /8E4 /8=E4 /8=D4 /8C4".to_notes
-  end
-end
-
-name = File.basename(__FILE__,".rb")
-
-File.open("#{name}.yml", "w") do |file|
-  file.write score.to_yaml
-end
-
-File.open("#{name}_packed.yml", "w") do |file|
-  file.write score.pack.to_yaml
-end

data/examples/notation/song2.rb

@@ -1,32 +0,0 @@
-require 'musicality'
-require 'yaml'
-
-include Musicality
-include Pitches
-include Meters
-
-score = Score::Measured.new(FOUR_FOUR, 120) do |s|
-  s.program += [0...4]*2
-  
-  s.parts[1] = Part.new(Dynamics::MF) do |p|
-    p.notes = "1C4 1Bb3 1Ab3 /2G3 /2Bb3".to_notes
-  end
-  
-  s.parts[2] = Part.new(Dynamics::MF) do |p|
-    p.notes = "3/8E5 1D5 1C5 5/8C5 /2C5 /2D5".to_notes
-  end
-  
-  s.parts[3] = Part.new(Dynamics::MF) do |p|
-    p.notes = "/8 /4G5 /2F5 /4 /4F5 /2Eb5 /4 /4Eb5 /2Eb5 /8 /2Eb5 /2F5".to_notes
-  end
-end
-
-name = File.basename(__FILE__,".rb")
-
-File.open("#{name}.yml", "w") do |file|
-  file.write score.to_yaml
-end
-
-File.open("#{name}_packed.yml", "w") do |file|
-  file.write score.pack.to_yaml
-end

data/lib/musicality/notation/model/links.rb

@@ -1,11 +0,0 @@
-module Musicality
-
-module Links
-  TIE = :tie
-  GLISSANDO = :glissando
-  PORTAMENTO = :portamento
-  SLUR = :slur
-  LEGATO = :legato
-end
-
-end

data/lib/musicality/notation/packing/change_packing.rb

@@ -1,56 +0,0 @@
-module Musicality
-
-class Change
-  class Immediate < Change
-    def change_type_str; "Immediate"; end
-    def pack with: nil
-      super(:with => with)
-    end
-    
-    def self.unpack(packing, with: nil)
-      end_val = packing["end_value"]
-      new(with.nil? ? end_val : end_val.send(with))
-    end
-  end
-  
-  class Gradual < Change
-    def change_type_str; "Gradual"; end
-    def pack with: nil
-      packing = super(:with => with)
-      packing.merge!("duration" => @duration, "transition" => @transition)
-      unless @start_value.nil?
-        packing["start_value"] = with.nil? ? @start_value : @start_value.send(with)
-      end
-      return packing
-    end
-    def self.unpack packing, with: nil
-      start_val, end_val = packing["start_value"], packing["end_value"]
-      new(with.nil? ? end_val : end_val.send(with),
-          packing["duration"], packing["transition"],
-          start_value: (start_val.nil? || with.nil?) ? start_val : start_val.send(with))
-    end
-    
-    class Trimmed < Gradual
-      def change_type_str; "Gradual::Trimmed"; end
-      def pack with: nil
-        super(:with => with).merge("preceding" => @preceding, "remaining" => @remaining)
-      end
-      def self.unpack packing, with: nil
-        Gradual.unpack(packing, :with => with).to_trimmed(
-          packing["preceding"], packing["remaining"])
-      end
-    end
-  end
-
-  def pack with: nil
-    { "end_value" => (with.nil? ? @end_value : @end_value.send(with)),
-      "type" => self.change_type_str }
-  end
-
-  def self.unpack packing, with: nil
-    type = const_get(packing["type"])
-    type.unpack(packing, with: with)
-  end  
-end
-
-end