head_music 0.14.2 → 0.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94643e9fad9404dd51c148dd74a9deba4f0100b5
-  data.tar.gz: 5509506687c478db25e7c38d64ea69994d46f1b2
+  metadata.gz: ff284893d21767573fa4d994b8500e229e067aa6
+  data.tar.gz: 5dc30f493cfd2b0774c6fb87399b7d237f164166
 SHA512:
-  metadata.gz: 5e704efcbffd9738263488cebaaf3478dc8bdf7cae22f55875d681cdb7017d6bea510620f9db77a2e012947caab0677077853e0af818ea5d760302706a4c31d6
-  data.tar.gz: 6d16156270a86e137083ba7376e4bbc486e9635dc11fd628cef10d453f84ea1280c8b3a2251e1d4efe6c484781295bc39c2db29f1b0e3d976d994a1e67ce6eaa
+  metadata.gz: 9aca4f3ab9e889f03a33074f110c1fafc48dc4606e1b8c89ff2d4e8be54b9879cac792f3825c0c3edd0e7c805ae55866d10988e47afbb9ed9b8a1b91b43659cb
+  data.tar.gz: e0303cd214d229ad6d20988e2d98e988471f0494c0a56acd2c183b2709b509516b428e839c6580b43d2e699e89f13e3a0a3870f277562da1d3643390103b09f9

data/lib/head_music/scale_degree.rb

@@ -0,0 +1,51 @@
+class HeadMusic::ScaleDegree
+  include Comparable
+
+  NAME_FOR_DIATONIC_DEGREE = [nil, 'tonic', 'supertonic', 'mediant', 'subdominant', 'dominant', 'submediant']
+
+  attr_reader :key_signature, :spelling
+  delegate :scale, to: :key_signature
+  delegate :scale_type, to: :scale
+
+  def initialize(key_signature, spelling)
+    @key_signature = key_signature
+    @spelling = Spelling.get(spelling)
+  end
+
+  def degree
+    scale.letter_name_cycle.index(spelling.letter_name.to_s) + 1
+  end
+
+  def accidental
+    spelling.accidental
+    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)
+  end
+
+  def to_s
+    "#{accidental}#{degree}"
+  end
+
+  def <=>(other)
+    if other.is_a?(HeadMusic::ScaleDegree)
+      [degree, accidental.semitones] <=> [other.degree, other.accidental.semitones]
+    else
+      to_s <=> other.to_s
+    end
+  end
+
+  def name_for_degree
+    if scale_type.diatonic?
+      NAME_FOR_DIATONIC_DEGREE[degree] ||
+      (scale_type.intervals.last == 1 || accidental == '#' ? 'leading tone' : 'subtonic')
+    end
+  end
+
+  private
+
+  def scale_degree_usual_spelling
+    Spelling.get(scale.spellings[degree - 1])
+  end
+end

data/lib/head_music/scale_type.rb

@@ -92,4 +92,8 @@ class HeadMusic::ScaleType
   def parent
     @parent ||= self.class.get(parent_name) if parent_name
   end
+
+  def diatonic?
+    intervals.length == 7
+  end
 end

data/lib/head_music/style/annotation.rb

@@ -33,6 +33,10 @@ class HeadMusic::Style::Annotation
     fitness == 1
   end
 
+  def notes?
+    first_note
+  end
+
   def start_position
     [marks].flatten.compact.map(&:start_position).sort.first
   end
@@ -113,7 +117,8 @@ class HeadMusic::Style::Annotation
   end
 
   def positions
-    @positions ||= voices.map(&:notes).flatten.map(&:position).sort.uniq(&:to_s)
+    @positions ||=
+      voices.map(&:notes).flatten.map(&:position).sort.uniq(&:to_s)
   end
 
   def unsorted_higher_voices

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

@@ -2,16 +2,56 @@ module HeadMusic::Style::Annotations
 end
 
 class HeadMusic::Style::Annotations::ConsonantClimax < HeadMusic::Style::Annotation
-  MESSAGE = "Peak on a consonant high note one time."
+  MESSAGE = "Peak on a consonant high note one time or twice with a step between."
 
   def marks
-    if notes
-      improper_climaxes = highest_notes.select.with_index do |note, i|
-        tonic_pitch = HeadMusic::Pitch.get(tonic_spelling)
-        interval = HeadMusic::FunctionalInterval.new(tonic_pitch, note.pitch)
-        interval.consonance(:melodic).dissonant? || i > 0
-      end
-      HeadMusic::Style::Mark.for_each(improper_climaxes)
-    end
+    HeadMusic::Style::Mark.for_each(highest_notes) if !adherent_climax?
+  end
+
+  private
+
+  def adherent_climax?
+    notes? && highest_pitch_consonant_with_tonic? &&
+      ( highest_pitch_appears_once? || highest_pitch_appears_twice_with_step_between? )
+  end
+
+  def highest_pitch_consonant_with_tonic?
+    functional_interval_to_highest_pitch.consonance?(:melodic)
+  end
+
+  def functional_interval_to_highest_pitch
+    @functional_interval_to_highest_pitch ||=
+      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
+
+  def highest_pitch_appears_twice_with_step_between?
+    highest_pitch_appears_twice? &&
+    single_note_between_highest_notes? &&
+    step_between_highest_notes?
+  end
+
+  def highest_pitch_appears_twice?
+    highest_notes.length == 2
+  end
+
+  def step_between_highest_notes?
+    MelodicInterval.new(voice, highest_notes.first, notes_between_highest_notes.first).step?
+  end
+
+  def single_note_between_highest_notes?
+    notes_between_highest_notes.length == 1
+  end
+
+  def notes_between_highest_notes
+    indexes = highest_notes.map { |note| notes.index(note) }
+    notes[(indexes.first + 1)..(indexes.last - 1)] || []
   end
 end

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

@@ -5,6 +5,20 @@ class HeadMusic::Style::Annotations::Diatonic < HeadMusic::Style::Annotation
   MESSAGE = "Use only notes in the key signature."
 
   def marks
-    HeadMusic::Style::Mark.for_each(notes_not_in_key)
+    HeadMusic::Style::Mark.for_each(notes_not_in_key_excluding_penultimate_leading_tone)
+  end
+
+  private
+
+  def notes_not_in_key_excluding_penultimate_leading_tone
+    notes_not_in_key.reject do |note|
+      penultimate_note &&
+      note == penultimate_note &&
+      HeadMusic::ScaleDegree.new(key_signature, note.pitch.spelling).accidental == '#'
+    end
+  end
+
+  def penultimate_note
+    voice.note_preceding(positions.last) if positions.last
   end
 end

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

@@ -2,10 +2,10 @@ module HeadMusic::Style::Annotations
 end
 
 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]
+  PERMITTED_ASCENDING = %w[PU m2 M2 m3 M3 P4 P5 m6 P8]
+  PERMITTED_DESCENDING = %w[PU m2 M2 m3 M3 P4 P5 P8]
 
-  MESSAGE = "Use only m2, M2, m3, M3, P4, P5, m6 (ascending), P8."
+  MESSAGE = "Use only PU, m2, M2, m3, M3, P4, P5, m6 (ascending), P8 in the melodic line."
 
   def marks
     melodic_intervals.reject { |interval| permitted?(interval) }.map do |unpermitted_interval|

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

@@ -9,6 +9,7 @@ class HeadMusic::Style::Rulesets::CantusFirmus
     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,

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

@@ -3,7 +3,7 @@ end
 
 class HeadMusic::Style::Rulesets::FirstSpeciesMelody
   RULESET = [
-    HeadMusic::Style::Annotations::AlwaysMove,
+    HeadMusic::Style::Annotations::ConsonantClimax,
     HeadMusic::Style::Annotations::Diatonic,
     HeadMusic::Style::Annotations::DirectionChanges,
     HeadMusic::Style::Annotations::EndOnTonic,

data/lib/head_music/version.rb

@@ -1,3 +1,3 @@
 module HeadMusic
-  VERSION = "0.14.2"
+  VERSION = "0.14.4"
 end

data/lib/head_music.rb

@@ -34,6 +34,7 @@ require 'head_music/rhythm'
 require 'head_music/rhythmic_unit'
 require 'head_music/rhythmic_value'
 require 'head_music/scale'
+require 'head_music/scale_degree'
 require 'head_music/scale_type'
 require 'head_music/spelling'
 require 'head_music/staff'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: head_music
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.14.4
 platform: ruby
 authors:
 - Rob Head
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-11 00:00:00.000000000 Z
+date: 2017-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -145,6 +145,7 @@ files:
 - lib/head_music/rhythmic_unit.rb
 - lib/head_music/rhythmic_value.rb
 - lib/head_music/scale.rb
+- lib/head_music/scale_degree.rb
 - lib/head_music/scale_type.rb
 - lib/head_music/spelling.rb
 - lib/head_music/staff.rb