head_music 0.14.5 → 0.14.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0b7d00507a0468cb5947e49f0dc1847f7ca1c0b
-  data.tar.gz: c24126e1c7dbee18ab8f7f2571a95502fa0346c8
+  metadata.gz: 6ee796cb3bb39a7c883ef5fecff41ead56379c3a
+  data.tar.gz: 35bc35b0515ea35214ee16b8a6375db44ad87ed2
 SHA512:
-  metadata.gz: 7720a64094550760f3f70be5f1bc4eadd7adb8c7c454107f1b9f0e3eb81782b9db8a470cb832819512c02e1ca82e9bb659ae729c90181ce04fe99a0d1a1d3823
-  data.tar.gz: 42cc3e0ec4c1e149c504f020a82beb794ff6e4f0b6f33fb33f5ac476098fd215d5ca6ab4ec60d0191afb918aac69887cf3dde45fbe9c72a0fba471bbdea8cea3
+  metadata.gz: f95982b86a3367e79908aba86aa4b718d57fe29be9ddd101bd5cf718be0d12d34b746050e57286258e4f2894188e0741615f48af96b90fba974ce5f8c4bd9ee7
+  data.tar.gz: def4f16467102b4d9b8e3cf8a1dbdd8e36af1d3e76a8c5410d9ac331ece35e06083fbddd6543cf8cab7f7f19b11183d06374ea5f915f49ad090e20101fd57f6a

data/lib/head_music/functional_interval.rb

@@ -191,8 +191,12 @@ class HeadMusic::FunctionalInterval
     self.semitones <=> other.semitones
   end
 
-  NUMBER_NAMES.each do |method_name|
-    define_method(:"#{method_name}?") { number_name == method_name }
+  NUMBER_NAMES.each do |interval_name|
+    define_method(:"#{interval_name}?") { number_name == interval_name }
+  end
+
+  NUMBER_NAMES.first(8).each do |method_name|
+    define_method(:"#{method_name}_or_compound?") { simple_number_name == method_name }
   end
 
   private
@@ -202,10 +206,10 @@ class HeadMusic::FunctionalInterval
   end
 
   def consonance_for_major_and_minor
-    HeadMusic::Consonance.get((third? || sixth?) ? :imperfect : :dissonant) if (major? || minor?)
+    HeadMusic::Consonance.get((third_or_compound? || sixth_or_compound?) ? :imperfect : :dissonant) if (major? || minor?)
   end
 
   def dissonant_fourth?(style = :standard_practice)
-    fourth? && style == :two_part_harmony
+    fourth_or_compound? && style == :two_part_harmony
   end
 end

data/lib/head_music/note.rb

@@ -15,6 +15,10 @@ class HeadMusic::Note
     @placement ||= HeadMusic::Placement.new(voice, position, rhythmic_value, pitch)
   end
 
+  def to_s
+    "#{pitch} at #{position}"
+  end
+
   def method_missing(method_name, *args, &block)
     placement.send(method_name, *args, &block)
   end

data/lib/head_music/placement.rb

@@ -31,6 +31,10 @@ class HeadMusic::Placement
     (other_placement.position <= position && other_placement.next_position >= next_position)
   end
 
+  def to_s
+    "#{pitch ? pitch : 'rest'} at #{position}"
+  end
+
   private
 
   def ensure_attributes(voice, position, rhythmic_value, pitch)

data/lib/head_music/scale_degree.rb

@@ -21,7 +21,7 @@ class HeadMusic::ScaleDegree
     scale_degree_usual_spelling.accidental
     accidental_semitones = spelling.accidental && spelling.accidental.semitones || 0
     usual_accidental_semitones = scale_degree_usual_spelling.accidental && scale_degree_usual_spelling.accidental.semitones || 0
-    Accidental.for_interval(accidental_semitones - usual_accidental_semitones)
+    HeadMusic::Accidental.for_interval(accidental_semitones - usual_accidental_semitones)
   end
 
   def to_s

data/lib/head_music/style/annotation.rb

@@ -84,7 +84,11 @@ class HeadMusic::Style::Annotation
   end
 
   def functional_interval_from_tonic(note)
-    HeadMusic::FunctionalInterval.new(tonic_spelling, note.spelling)
+    tonic_to_use = tonic_pitch
+    while tonic_to_use > note.pitch
+      tonic_to_use -= Interval.named(:perfect_octave)
+    end
+    HeadMusic::FunctionalInterval.new(tonic_to_use, note.pitch)
   end
 
   def bass_voice?
@@ -128,4 +132,8 @@ class HeadMusic::Style::Annotation
   def unsorted_lower_voices
     other_voices.select { |part| part.lowest_pitch && lowest_pitch && part.lowest_pitch < lowest_pitch }
   end
+
+  def tonic_pitch
+    @tonic_pitch ||= HeadMusic::Pitch.get(tonic_spelling)
+  end
 end

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

@@ -24,10 +24,6 @@ class HeadMusic::Style::Annotations::ConsonantClimax < HeadMusic::Style::Annotat
       HeadMusic::FunctionalInterval.new(tonic_pitch, highest_pitch)
   end
 
-  def tonic_pitch
-    @tonic_pitch ||= HeadMusic::Pitch.get(tonic_spelling)
-  end
-
   def highest_pitch_appears_once?
     highest_notes.length == 1
   end
@@ -43,7 +39,7 @@ class HeadMusic::Style::Annotations::ConsonantClimax < HeadMusic::Style::Annotat
   end
 
   def step_between_highest_notes?
-    MelodicInterval.new(voice, highest_notes.first, notes_between_highest_notes.first).step?
+    HeadMusic::MelodicInterval.new(voice, highest_notes.first, notes_between_highest_notes.first).step?
   end
 
   def single_note_between_highest_notes?

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

@@ -3,7 +3,7 @@ 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
-  MESSAGE = 'Start on the tonic or a perfect consonance above the tonic.'
+  MESSAGE = 'Start on the tonic or a perfect consonance above the tonic (unless bass voice).'
 
   def marks
     if first_note && ((bass_voice? && !starts_on_tonic?) || !starts_on_perfect_consonance?)

data/lib/head_music/version.rb

@@ -1,3 +1,3 @@
 module HeadMusic
-  VERSION = "0.14.5"
+  VERSION = "0.14.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: head_music
 version: !ruby/object:Gem::Version
-  version: 0.14.5
+  version: 0.14.7
 platform: ruby
 authors:
 - Rob Head