head_music 0.11.8 → 0.11.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6be1575228b7a6ea778c74be5e1f0422732fa7e0
-  data.tar.gz: 5761e7ae91487307331c9f73487d6b91a1fdd8d9
+  metadata.gz: 3a0baef52f11f8aab0c4becbe31e70928b358499
+  data.tar.gz: 47ae1ef06c1e25a2abd0559eb40a20494c47eed3
 SHA512:
-  metadata.gz: b754a036d18c02225ed9bef0e9a778f870adf265a39df3d612dbc67544631496883fe2cda40c5088bfaac58fe46df309e38e43037eb43c4b96258650ca82d49e
-  data.tar.gz: 4e7bb9461fbf78a833773d1cabcbbe0574e48087fde520f4f181aeafdb4ade491adcc463b79c2b384e50e437bf3e31a50d3ea2885314dea845e75f130075c843
+  metadata.gz: 07e0d608df0d6e5901e652c8796b84ef99c2987c94a346347efff6c73d0b159352d0813eaa2a932530fe7f5e1613548c96ca9c2dbcc2b486ef4978d4e6509235
+  data.tar.gz: 1dd90a0197c26138b56b109de9dae548c5b9d4b6f4f382b13da80b2fa1093d006c197e26523ff4f2bacb5863bee878d36037049857e8c2655bb3fd61125ec7ae

data/lib/head_music/composition.rb

@@ -3,6 +3,7 @@ class HeadMusic::Composition
 
   def initialize(name: nil, key_signature: nil, meter: nil)
     ensure_attributes(name, key_signature, meter)
+    @voices = []
   end
 
   def add_bar
@@ -17,8 +18,8 @@ class HeadMusic::Composition
   end
 
   def add_voice(role: nil)
-    @voices ||= []
     @voices << HeadMusic::Voice.new(composition: self, role: role)
+    @voices.last
   end
 
   private

data/lib/head_music/functional_interval.rb

@@ -178,6 +178,22 @@ class HeadMusic::FunctionalInterval
     end
   end
 
+  def consonance?(style = :standard_practice)
+    consonance(style).perfect? || consonance(style).imperfect?
+  end
+
+  def perfect_consonance?(style = :standard_practice)
+    consonance(style).perfect?
+  end
+
+  def imperfect_consonance?(style = :standard_practice)
+    consonance(style).imperfect?
+  end
+
+  def dissonance?(style = :standard_practice)
+    consonance(style).dissonant?
+  end
+
   def step?
     number <= 2
   end

data/lib/head_music/style/annotations/end_on_perfect_consonance.rb

@@ -0,0 +1,29 @@
+module HeadMusic::Style::Annotations
+end
+
+# marks the voice if the first note is not the first or fifth scale degree of the key.
+class HeadMusic::Style::Annotations::EndOnPerfectConsonance < HeadMusic::Style::Annotation
+  def message
+    'End on the tonic or a perfect consonance above the tonic.'
+  end
+
+  def marks
+    if last_note && !ends_on_perfect_consonance?
+      HeadMusic::Style::Mark.for(last_note)
+    end
+  end
+
+  private
+
+  def ends_on_perfect_consonance?
+    functional_interval.perfect_consonance?(:two_part_harmony)
+  end
+
+  def functional_interval
+    HeadMusic::FunctionalInterval.new(composition.key_signature.tonic_spelling, last_note.spelling)
+  end
+
+  def last_note
+    notes.last
+  end
+end

data/lib/head_music/style/annotations/one_to_one.rb

@@ -0,0 +1,32 @@
+module HeadMusic::Style::Annotations
+end
+
+class HeadMusic::Style::Annotations::OneToOne < HeadMusic::Style::Annotation
+  def message
+    'Place a note for each note in the other voice.'
+  end
+
+  def marks
+    if other_voice && other_voice.notes.length > 0
+      HeadMusic::Style::Mark.for_each(
+        notes_without_match(voice, other_voice) + notes_without_match(other_voice, voice)
+      )
+    end
+  end
+
+  private
+
+  def notes_without_match(voice1, voice2)
+    voice1.notes.reject do |voice1_note|
+      voice2.notes.map(&:position).include?(voice1_note.position)
+    end
+  end
+
+  def other_voice
+    other_voices.detect(&:cantus_firmus?) || other_voices.first
+  end
+
+  def other_voices
+    @other_voices ||= voice.composition.voices.select { |part| part != voice }
+  end
+end

data/lib/head_music/style/annotations/{permitted_intervals.rb → singable_intervals.rb}

@@ -1,7 +1,7 @@
 module HeadMusic::Style::Annotations
 end
 
-class HeadMusic::Style::Annotations::PermittedIntervals < HeadMusic::Style::Annotation
+class HeadMusic::Style::Annotations::SingableIntervals < HeadMusic::Style::Annotation
   PERMITTED_ASCENDING = %w[m2 M2 m3 M3 P4 P5 m6 P8]
   PERMITTED_DESCENDING = %w[m2 M2 m3 M3 P4 P5 P8]
 

data/lib/head_music/style/annotations/start_on_perfect_consonance.rb

@@ -0,0 +1,29 @@
+module HeadMusic::Style::Annotations
+end
+
+# marks the voice if the first note is not the first or fifth scale degree of the key.
+class HeadMusic::Style::Annotations::StartOnPerfectConsonance < HeadMusic::Style::Annotation
+  def message
+    'Start on the tonic or a perfect consonance above the tonic.'
+  end
+
+  def marks
+    if first_note && !starts_on_perfect_consonance?
+      HeadMusic::Style::Mark.for(first_note)
+    end
+  end
+
+  private
+
+  def starts_on_perfect_consonance?
+    functional_interval.perfect_consonance?(:two_part_harmony)
+  end
+
+  def functional_interval
+    HeadMusic::FunctionalInterval.new(composition.key_signature.tonic_spelling, first_note.spelling)
+  end
+
+  def first_note
+    notes.first
+  end
+end

data/lib/head_music/style/annotations/step_up_to_final_note.rb

@@ -0,0 +1,33 @@
+module HeadMusic::Style::Annotations
+end
+
+class HeadMusic::Style::Annotations::StepUpToFinalNote < HeadMusic::Style::Annotation
+  def message
+    'Step up to final note.'
+  end
+
+  def marks
+    if !last_melodic_interval.nil?
+      fitness = 1
+      fitness *= HeadMusic::PENALTY_FACTOR unless step?
+      fitness *= HeadMusic::PENALTY_FACTOR unless ascending?
+      if fitness < 1
+        HeadMusic::Style::Mark.for_all(notes[-2..-1], fitness: fitness)
+      end
+    end
+  end
+
+  private
+
+  def ascending?
+    last_melodic_interval && last_melodic_interval.ascending?
+  end
+
+  def step?
+    last_melodic_interval && last_melodic_interval.step?
+  end
+
+  def last_melodic_interval
+    @last_melodic_interval ||= melodic_intervals.last
+  end
+end

data/lib/head_music/style/mark.rb

@@ -6,7 +6,8 @@ class HeadMusic::Style::Mark
   end
 
   def self.for_all(placements, fitness: nil)
-    placements = [placements].flatten
+    placements = [placements].flatten.compact
+    return [] if placements.length == 0
     start_position = placements.map { |placement| placement.position }.sort.first
     end_position = placements.map { |placement| placement.next_position }.sort.last
     new(start_position, end_position, placements: placements, fitness: fitness)

data/lib/head_music/style/rulesets/cantus_firmus.rb

@@ -13,7 +13,7 @@ class HeadMusic::Style::Rulesets::CantusFirmus
     HeadMusic::Style::Annotations::MostlyConjunct,
     HeadMusic::Style::Annotations::NoRests,
     HeadMusic::Style::Annotations::NotesSameLength,
-    HeadMusic::Style::Annotations::PermittedIntervals,
+    HeadMusic::Style::Annotations::SingableIntervals,
     HeadMusic::Style::Annotations::RecoverLargeLeaps,
     HeadMusic::Style::Annotations::StartOnTonic,
     HeadMusic::Style::Annotations::StepDownToFinalNote,

data/lib/head_music/style/rulesets/first_species_harmony.rb

@@ -0,0 +1,12 @@
+module HeadMusic::Style::Rulesets
+end
+
+class HeadMusic::Style::Rulesets::FirstSpeciesHarmony
+  RULESET = [
+    # HeadMusic::Style::Annotations::ConsonantOnStrongBeats,
+  ]
+
+  def self.analyze(voice)
+    RULESET.map { |rule| rule.new(voice) }
+  end
+end

data/lib/head_music/style/rulesets/first_species_melody.rb

@@ -0,0 +1,17 @@
+module HeadMusic::Style::Rulesets
+end
+
+class HeadMusic::Style::Rulesets::FirstSpeciesMelody
+  RULESET = [
+    HeadMusic::Style::Annotations::OneToOne,
+    HeadMusic::Style::Annotations::NotesSameLength,
+    HeadMusic::Style::Annotations::SingableIntervals,
+    HeadMusic::Style::Annotations::StartOnPerfectConsonance,
+    HeadMusic::Style::Annotations::EndOnPerfectConsonance,
+    HeadMusic::Style::Annotations::StepUpToFinalNote,
+  ]
+
+  def self.analyze(voice)
+    RULESET.map { |rule| rule.new(voice) }
+  end
+end

data/lib/head_music/version.rb

@@ -1,3 +1,3 @@
 module HeadMusic
-  VERSION = "0.11.8"
+  VERSION = "0.11.9"
 end

data/lib/head_music/voice.rb

@@ -63,6 +63,10 @@ class HeadMusic::Voice
     melodic_intervals.select(&:leap?)
   end
 
+  def cantus_firmus?
+    role && role =~ /cantus.?firmus/i
+  end
+
   private
 
   def insert_into_placements(placement)

data/lib/head_music.rb

@@ -43,18 +43,24 @@ require 'head_music/style/annotations/at_least_eight_notes'
 require 'head_music/style/annotations/consonant_climax'
 require 'head_music/style/annotations/diatonic'
 require 'head_music/style/annotations/direction_changes'
+require 'head_music/style/annotations/end_on_perfect_consonance'
 require 'head_music/style/annotations/end_on_tonic'
 require 'head_music/style/annotations/limit_range'
 require 'head_music/style/annotations/mostly_conjunct'
 require 'head_music/style/annotations/no_rests'
 require 'head_music/style/annotations/notes_same_length'
-require 'head_music/style/annotations/permitted_intervals'
+require 'head_music/style/annotations/one_to_one'
 require 'head_music/style/annotations/recover_large_leaps'
+require 'head_music/style/annotations/singable_intervals'
+require 'head_music/style/annotations/start_on_perfect_consonance'
 require 'head_music/style/annotations/start_on_tonic'
 require 'head_music/style/annotations/step_down_to_final_note'
+require 'head_music/style/annotations/step_up_to_final_note'
 require 'head_music/style/annotations/up_to_thirteen_notes'
 
 require 'head_music/style/rulesets/cantus_firmus'
+require 'head_music/style/rulesets/first_species_melody'
+require 'head_music/style/rulesets/first_species_harmony'
 
 require 'head_music/utilities/hash_key'
 require 'head_music/voice'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: head_music
 version: !ruby/object:Gem::Version
-  version: 0.11.8
+  version: 0.11.9
 platform: ruby
 authors:
 - Rob Head
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2017-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -152,18 +152,24 @@ files:
 - lib/head_music/style/annotations/consonant_climax.rb
 - lib/head_music/style/annotations/diatonic.rb
 - lib/head_music/style/annotations/direction_changes.rb
+- lib/head_music/style/annotations/end_on_perfect_consonance.rb
 - lib/head_music/style/annotations/end_on_tonic.rb
 - lib/head_music/style/annotations/limit_range.rb
 - lib/head_music/style/annotations/mostly_conjunct.rb
 - lib/head_music/style/annotations/no_rests.rb
 - lib/head_music/style/annotations/notes_same_length.rb
-- lib/head_music/style/annotations/permitted_intervals.rb
+- lib/head_music/style/annotations/one_to_one.rb
 - lib/head_music/style/annotations/recover_large_leaps.rb
+- lib/head_music/style/annotations/singable_intervals.rb
+- lib/head_music/style/annotations/start_on_perfect_consonance.rb
 - lib/head_music/style/annotations/start_on_tonic.rb
 - lib/head_music/style/annotations/step_down_to_final_note.rb
+- lib/head_music/style/annotations/step_up_to_final_note.rb
 - lib/head_music/style/annotations/up_to_thirteen_notes.rb
 - lib/head_music/style/mark.rb
 - lib/head_music/style/rulesets/cantus_firmus.rb
+- lib/head_music/style/rulesets/first_species_harmony.rb
+- lib/head_music/style/rulesets/first_species_melody.rb
 - lib/head_music/utilities/hash_key.rb
 - lib/head_music/version.rb
 - lib/head_music/voice.rb