head_music 0.11.9 → 0.13.2

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

@@ -2,21 +2,11 @@ module HeadMusic::Style::Annotations
 end
 
 class HeadMusic::Style::Annotations::StartOnTonic < HeadMusic::Style::Annotation
-  def message
-    'Start on the tonic.'
-  end
+  MESSAGE = 'Start on the tonic.'
 
   def marks
     if first_note && !starts_on_tonic?
       HeadMusic::Style::Mark.for(first_note)
     end
   end
-
-  def starts_on_tonic?
-    composition.key_signature.tonic_spelling == first_note.spelling
-  end
-
-  def first_note
-    notes.first
-  end
 end

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

@@ -2,9 +2,7 @@ module HeadMusic::Style::Annotations
 end
 
 class HeadMusic::Style::Annotations::StepDownToFinalNote < HeadMusic::Style::Annotation
-  def message
-    'Step down to final note.'
-  end
+  MESSAGE = 'Step down to final note.'
 
   def marks
     if !last_melodic_interval.nil?

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

@@ -0,0 +1,38 @@
+module HeadMusic::Style::Annotations
+end
+
+class HeadMusic::Style::Annotations::StepOutOfUnison < HeadMusic::Style::Annotation
+  MESSAGE = "Exit a unison by step."
+
+  def marks
+    skips_following_unisons.map do |skip|
+      HeadMusic::Style::Mark.for_all(skip.notes)
+    end.flatten
+  end
+
+  private
+
+  def skips_following_unisons
+    melodic_intervals_following_unisons.select(&:skip?)
+  end
+
+  def melodic_intervals_following_unisons
+    unisons.map do |unison|
+      note1 = voice.note_at(unison.position)
+      note2 = voice.note_following(unison.position)
+      MelodicInterval.new(voice, note1, note2) if note2
+    end.reject(&:nil?)
+  end
+
+  def unisons
+    harmonic_intervals.select { |interval| interval.perfect_consonance? && interval.unison? }
+  end
+
+  def harmonic_intervals
+    positions.map { |position| HarmonicInterval.new(cantus_firmus, voice, position) }
+  end
+
+  def positions
+    voices.map(&:notes).flatten.map(&:position).sort.uniq(&:to_s)
+  end
+end

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

@@ -2,9 +2,7 @@ module HeadMusic::Style::Annotations
 end
 
 class HeadMusic::Style::Annotations::StepUpToFinalNote < HeadMusic::Style::Annotation
-  def message
-    'Step up to final note.'
-  end
+  MESSAGE = 'Step up to final note.'
 
   def marks
     if !last_melodic_interval.nil?

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

@@ -4,13 +4,11 @@ end
 class HeadMusic::Style::Annotations::UpToThirteenNotes < HeadMusic::Style::Annotation
   MAXIMUM_NOTES = 13
 
-  def message
-    'Write up to thirteen notes.'
-  end
+  MESSAGE = 'Write up to thirteen notes.'
 
   def marks
     if overage > 0
-      HeadMusic::Style::Mark.for_all(notes[13..-1])
+      HeadMusic::Style::Mark.for_each(notes[13..-1])
     end
   end
 

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

@@ -9,12 +9,12 @@ class HeadMusic::Style::Rulesets::CantusFirmus
     HeadMusic::Style::Annotations::Diatonic,
     HeadMusic::Style::Annotations::DirectionChanges,
     HeadMusic::Style::Annotations::EndOnTonic,
-    HeadMusic::Style::Annotations::LimitRange,
     HeadMusic::Style::Annotations::MostlyConjunct,
     HeadMusic::Style::Annotations::NoRests,
     HeadMusic::Style::Annotations::NotesSameLength,
-    HeadMusic::Style::Annotations::SingableIntervals,
     HeadMusic::Style::Annotations::RecoverLargeLeaps,
+    HeadMusic::Style::Annotations::SingableIntervals,
+    HeadMusic::Style::Annotations::SingableRange,
     HeadMusic::Style::Annotations::StartOnTonic,
     HeadMusic::Style::Annotations::StepDownToFinalNote,
     HeadMusic::Style::Annotations::UpToThirteenNotes,

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

@@ -3,7 +3,14 @@ end
 
 class HeadMusic::Style::Rulesets::FirstSpeciesHarmony
   RULESET = [
-    # HeadMusic::Style::Annotations::ConsonantOnStrongBeats,
+    HeadMusic::Style::Annotations::ApproachPerfectionContrarily,
+    HeadMusic::Style::Annotations::AvoidCrossingVoices,
+    HeadMusic::Style::Annotations::AvoidOverlappingVoices,
+    HeadMusic::Style::Annotations::ConsonantDownbeats,
+    HeadMusic::Style::Annotations::PreferContraryMotion,
+    HeadMusic::Style::Annotations::PreferImperfect,
+    HeadMusic::Style::Annotations::NoUnisonsInMiddle,
+    HeadMusic::Style::Annotations::OneToOne,
   ]
 
   def self.analyze(voice)

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

@@ -3,11 +3,19 @@ end
 
 class HeadMusic::Style::Rulesets::FirstSpeciesMelody
   RULESET = [
-    HeadMusic::Style::Annotations::OneToOne,
+    HeadMusic::Style::Annotations::AlwaysMove,
+    HeadMusic::Style::Annotations::Diatonic,
+    HeadMusic::Style::Annotations::DirectionChanges,
+    HeadMusic::Style::Annotations::EndOnTonic,
+    HeadMusic::Style::Annotations::LimitOctaveLeaps,
+    HeadMusic::Style::Annotations::MostlyConjunct,
+    HeadMusic::Style::Annotations::NoRests,
     HeadMusic::Style::Annotations::NotesSameLength,
+    HeadMusic::Style::Annotations::RecoverLargeLeaps,
     HeadMusic::Style::Annotations::SingableIntervals,
+    HeadMusic::Style::Annotations::SingableRange,
     HeadMusic::Style::Annotations::StartOnPerfectConsonance,
-    HeadMusic::Style::Annotations::EndOnPerfectConsonance,
+    HeadMusic::Style::Annotations::StepOutOfUnison,
     HeadMusic::Style::Annotations::StepUpToFinalNote,
   ]
 

data/lib/head_music/version.rb

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

data/lib/head_music/voice.rb

@@ -63,8 +63,38 @@ class HeadMusic::Voice
     melodic_intervals.select(&:leap?)
   end
 
+  def large_leaps
+    melodic_intervals.select(&:large_leap?)
+  end
+
   def cantus_firmus?
-    role && role =~ /cantus.?firmus/i
+    role.to_s =~ /cantus.?firmus/i
+  end
+
+  def note_at(position)
+    notes.detect { |note| position.within_placement?(note) }
+  end
+
+  def notes_during(placement)
+    notes.select { |note| note.during?(placement) }
+  end
+
+  def note_preceding(position)
+    notes.select { |note| note.position < position }.last
+  end
+
+  def note_following(position)
+    notes.detect { |note| note.position > position }
+  end
+
+  def earliest_bar_number
+    return 1 if notes.empty?
+    placements.first.position.bar_number
+  end
+
+  def latest_bar_number
+    return 1 if notes.empty?
+    placements.last.position.bar_number
   end
 
   private

data/lib/head_music.rb

@@ -4,6 +4,8 @@ require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/string/access'
 require 'humanize'
 
+require 'head_music/named_rudiment'
+
 require 'head_music/accidental'
 require 'head_music/bar'
 require 'head_music/chord'
@@ -13,12 +15,14 @@ require 'head_music/composition'
 require 'head_music/consonance'
 require 'head_music/functional_interval'
 require 'head_music/grand_staff'
+require 'head_music/harmonic_interval'
 require 'head_music/instrument'
 require 'head_music/interval'
 require 'head_music/key_signature'
 require 'head_music/letter_name'
 require 'head_music/melodic_interval'
 require 'head_music/meter'
+require 'head_music/motion'
 require 'head_music/note'
 require 'head_music/octave'
 require 'head_music/pitch'
@@ -39,22 +43,31 @@ require 'head_music/style/annotation'
 require 'head_music/style/mark'
 
 require 'head_music/style/annotations/always_move'
+require 'head_music/style/annotations/approach_perfection_contrarily'
 require 'head_music/style/annotations/at_least_eight_notes'
+require 'head_music/style/annotations/avoid_crossing_voices'
+require 'head_music/style/annotations/avoid_overlapping_voices'
 require 'head_music/style/annotations/consonant_climax'
+require 'head_music/style/annotations/consonant_downbeats'
 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/limit_octave_leaps'
 require 'head_music/style/annotations/mostly_conjunct'
 require 'head_music/style/annotations/no_rests'
+require 'head_music/style/annotations/no_unisons_in_middle'
 require 'head_music/style/annotations/notes_same_length'
 require 'head_music/style/annotations/one_to_one'
+require 'head_music/style/annotations/prefer_contrary_motion'
+require 'head_music/style/annotations/prefer_imperfect'
 require 'head_music/style/annotations/recover_large_leaps'
 require 'head_music/style/annotations/singable_intervals'
+require 'head_music/style/annotations/singable_range'
 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_out_of_unison'
 require 'head_music/style/annotations/step_up_to_final_note'
 require 'head_music/style/annotations/up_to_thirteen_notes'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: head_music
 version: !ruby/object:Gem::Version
-  version: 0.11.9
+  version: 0.13.2
 platform: ruby
 authors:
 - Rob Head
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-03 00:00:00.000000000 Z
+date: 2017-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -125,12 +125,15 @@ files:
 - lib/head_music/consonance.rb
 - lib/head_music/functional_interval.rb
 - lib/head_music/grand_staff.rb
+- lib/head_music/harmonic_interval.rb
 - lib/head_music/instrument.rb
 - lib/head_music/interval.rb
 - lib/head_music/key_signature.rb
 - lib/head_music/letter_name.rb
 - lib/head_music/melodic_interval.rb
 - lib/head_music/meter.rb
+- lib/head_music/motion.rb
+- lib/head_music/named_rudiment.rb
 - lib/head_music/note.rb
 - lib/head_music/octave.rb
 - lib/head_music/pitch.rb
@@ -148,22 +151,31 @@ files:
 - lib/head_music/style/analysis.rb
 - lib/head_music/style/annotation.rb
 - lib/head_music/style/annotations/always_move.rb
+- lib/head_music/style/annotations/approach_perfection_contrarily.rb
 - lib/head_music/style/annotations/at_least_eight_notes.rb
+- lib/head_music/style/annotations/avoid_crossing_voices.rb
+- lib/head_music/style/annotations/avoid_overlapping_voices.rb
 - lib/head_music/style/annotations/consonant_climax.rb
+- lib/head_music/style/annotations/consonant_downbeats.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/limit_octave_leaps.rb
 - lib/head_music/style/annotations/mostly_conjunct.rb
 - lib/head_music/style/annotations/no_rests.rb
+- lib/head_music/style/annotations/no_unisons_in_middle.rb
 - lib/head_music/style/annotations/notes_same_length.rb
 - lib/head_music/style/annotations/one_to_one.rb
+- lib/head_music/style/annotations/prefer_contrary_motion.rb
+- lib/head_music/style/annotations/prefer_imperfect.rb
 - lib/head_music/style/annotations/recover_large_leaps.rb
 - lib/head_music/style/annotations/singable_intervals.rb
+- lib/head_music/style/annotations/singable_range.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_out_of_unison.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