head_music 0.14.8 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dc54a35d0ca69398e7352fe88520e30115b024e
-  data.tar.gz: 10f9dcfd37919dd40d23af0f4b411f727917cbcd
+  metadata.gz: 445b3a56d6b47014d6baa3d5a194f2721aebd04d
+  data.tar.gz: 5eade45431e7167069a5f669713dab209c70529c
 SHA512:
-  metadata.gz: 152d346e22b19611840ffcf664cd846b27c1ffa1f75352ac0c9a4f9e7be0433c03fbf506e43a4b9169e627d1092a7cba13f21680269b1089d3c0ac4c312d802f
-  data.tar.gz: c8441b1f2eabb346daadbdd0c331c742f22ca2937dd86c53056b20bebb629eb0aca678ba91ee0c6590d6979609c59b2257ac792644a09c1da2779a9eb5663bc2
+  metadata.gz: dfaf16a40716354c6364ddcdc749046a8af9800d838f190e829a56a38e9a5ae110757dc2aab69154c0290a279bcd2a7db6a9b7d10f56afc7d99e54f5c3b8a3b7
+  data.tar.gz: 8736a3fb3564809f62b64a5a7e502563ba08a484b15b1b80c8d4540c668b8ebbff1fa8ce077bb4f5be4b921ac53141d497e79bdaec25c0cbcbe170ea58b2cb94

data/lib/head_music/interval.rb

@@ -7,14 +7,11 @@ class HeadMusic::Interval
 
   attr_reader :semitones
 
-  def self.get(semitones)
+  def self.get(identifier)
     @intervals ||= {}
-    @intervals[semitones.to_i] ||= new(semitones.to_i)
-  end
-
-  def self.named(name)
-    name = name.to_s
-    get(NAMES.index(name)) if NAMES.include?(name)
+    candidate = identifier.to_s.downcase.gsub(/\W+/, '_')
+    semitones = NAMES.index(candidate) || identifier.to_i
+    @intervals[semitones] ||= new(semitones.to_i)
   end
 
   def initialize(semitones)

data/lib/head_music/key_signature.rb

@@ -14,7 +14,7 @@ class HeadMusic::KeySignature
     return identifier if identifier.is_a?(HeadMusic::KeySignature)
     @key_signatures ||= {}
     tonic_spelling, scale_type_name = identifier.strip.split(/\s/)
-    hash_key = HeadMusic::Utilities::HashKey.for(identifier)
+    hash_key = HeadMusic::Utilities::HashKey.for(identifier.gsub(/#/, 'sharp').gsub(/b/, 'flat'))
     @key_signatures[hash_key] ||= new(tonic_spelling, scale_type_name)
   end
 

data/lib/head_music/melodic_interval.rb

@@ -55,6 +55,18 @@ class HeadMusic::MelodicInterval
     !moving?
   end
 
+  def spans?(pitch)
+    pitch >= low_pitch && pitch <= high_pitch
+  end
+
+  def high_pitch
+    pitches.sort.last
+  end
+
+  def low_pitch
+    pitches.sort.first
+  end
+
   def direction
     @direction ||=
       if first_pitch < second_pitch
@@ -66,6 +78,13 @@ class HeadMusic::MelodicInterval
       end
   end
 
+  def spells_consonant_triad_with?(other_interval)
+    return false if step? || other_interval.step?
+    combined_pitches = (pitches + other_interval.pitches).uniq
+    return false if combined_pitches.length < 3
+    HeadMusic::Chord.new(combined_pitches).consonant_triad?
+  end
+
   def method_missing(method_name, *args, &block)
     functional_interval.send(method_name, *args, &block)
   end

data/lib/head_music/placement.rb

@@ -40,7 +40,7 @@ class HeadMusic::Placement
   def ensure_attributes(voice, position, rhythmic_value, pitch)
     @voice = voice
     ensure_position(position)
-    @rhythmic_value = rhythmic_value
+    @rhythmic_value = HeadMusic::RhythmicValue.get(rhythmic_value)
     @pitch = HeadMusic::Pitch.get(pitch)
   end
 

data/lib/head_music/rhythmic_value.rb

@@ -56,7 +56,7 @@ class HeadMusic::RhythmicValue
   end
 
   def multiplier
-    (0..dots).reduce(0) { |sum, i| sum + (1.0/2)**i }
+    (0..dots).reduce(0) { |sum, i| sum + 0.5**i }
   end
 
   def ticks

data/lib/head_music/style/analysis.rb

@@ -9,8 +9,9 @@ module HeadMusic
       end
 
       def messages
-        annotations.reject(&:perfect?).map(&:message)
+        annotations.reject(&:adherent?).map(&:message)
       end
+      alias_method :annotation_messages, :messages
 
       def annotations
         @annotations ||= @ruleset.analyze(subject)
@@ -21,6 +22,10 @@ module HeadMusic
         fitness_scores.inject(:+).to_f / fitness_scores.length
       end
 
+      def adherent?
+        fitness == 1
+      end
+
       private
 
       def fitness_scores

data/lib/head_music/style/annotation.rb

@@ -29,7 +29,7 @@ class HeadMusic::Style::Annotation
     [marks].flatten.compact.map(&:fitness).reduce(1, :*)
   end
 
-  def perfect?
+  def adherent?
     fitness == 1
   end
 
@@ -86,7 +86,7 @@ class HeadMusic::Style::Annotation
   def functional_interval_from_tonic(note)
     tonic_to_use = tonic_pitch
     while tonic_to_use > note.pitch
-      tonic_to_use -= HeadMusic::Interval.named(:perfect_octave)
+      tonic_to_use -= HeadMusic::Interval.get(:perfect_octave)
     end
     HeadMusic::FunctionalInterval.new(tonic_to_use, note.pitch)
   end

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

@@ -21,4 +21,7 @@ class HeadMusic::Style::Annotations::ApproachPerfectionContrarily < HeadMusic::S
       motion.second_harmonic_interval.perfect_consonance?
     end
   end
+
+  # Side effect is that you can't enter a perfect consonance by skip,
+  # which is a rule.
 end

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

@@ -15,25 +15,21 @@ class HeadMusic::Style::Annotations::AvoidOverlappingVoices < HeadMusic::Style::
   end
 
   def overlappings_of_lower_voices
-    [].tap do |marks|
-      lower_voices.each do |lower_voice|
-        overlapped_notes = voice.notes.select do |note|
-          preceding_note = lower_voice.note_preceding(note.position)
-          following_note = lower_voice.note_following(note.position)
-          (preceding_note && preceding_note.pitch > note.pitch) || (following_note && following_note.pitch > note.pitch)
-        end
-        marks << HeadMusic::Style::Mark.for_each(overlapped_notes)
-      end
-    end.flatten.compact
+    overlappings_for_voices(lower_voices, :>)
   end
 
   def overlappings_of_higher_voices
+    overlappings_for_voices(higher_voices, :<)
+  end
+
+  def overlappings_for_voices(voices, comparison_operator)
     [].tap do |marks|
-      higher_voices.each do |higher_voice|
+      voices.each do |higher_voice|
         overlapped_notes = voice.notes.select do |note|
           preceding_note = higher_voice.note_preceding(note.position)
           following_note = higher_voice.note_following(note.position)
-          (preceding_note && preceding_note.pitch < note.pitch) || (following_note && following_note.pitch < note.pitch)
+          (preceding_note && preceding_note.pitch.send(comparison_operator, note.pitch)) ||
+            (following_note && following_note.pitch.send(comparison_operator, note.pitch))
         end
         marks << HeadMusic::Style::Mark.for_each(overlapped_notes)
       end

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

@@ -11,43 +11,97 @@ class HeadMusic::Style::Annotations::ConsonantClimax < HeadMusic::Style::Annotat
   private
 
   def adherent_climax?
+    adherent_high_pitch? || adherent_low_pitch?
+  end
+
+  def adherent_high_pitch?
     notes? && highest_pitch_consonant_with_tonic? &&
       ( highest_pitch_appears_once? || highest_pitch_appears_twice_with_step_between? )
   end
 
+  def adherent_low_pitch?
+    notes? &&
+    only_goes_down? &&
+    lowest_pitch_consonant_with_tonic? &&
+      ( lowest_pitch_appears_once? || lowest_pitch_appears_twice_with_step_between? )
+  end
+
   def highest_pitch_consonant_with_tonic?
     functional_interval_to_highest_pitch.consonance?(:melodic)
   end
 
+  def lowest_pitch_consonant_with_tonic?
+    functional_interval_to_lowest_pitch.consonance?(:melodic)
+  end
+
   def functional_interval_to_highest_pitch
     @functional_interval_to_highest_pitch ||=
       HeadMusic::FunctionalInterval.new(tonic_pitch, highest_pitch)
   end
 
+  def functional_interval_to_lowest_pitch
+    @functional_interval_to_lowest_pitch ||=
+      HeadMusic::FunctionalInterval.new(tonic_pitch, lowest_pitch)
+  end
+
   def highest_pitch_appears_once?
     highest_notes.length == 1
   end
 
+  def lowest_pitch_appears_once?
+    lowest_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 lowest_pitch_appears_twice_with_step_between?
+    lowest_pitch_appears_twice? &&
+    single_note_between_lowest_notes? &&
+    step_between_lowest_notes?
+  end
+
   def highest_pitch_appears_twice?
     highest_notes.length == 2
   end
 
+  def lowest_pitch_appears_twice?
+    lowest_notes.length == 2
+  end
+
   def step_between_highest_notes?
     HeadMusic::MelodicInterval.new(voice, highest_notes.first, notes_between_highest_notes.first).step?
   end
 
+  def step_between_lowest_notes?
+    HeadMusic::MelodicInterval.new(voice, lowest_notes.first, notes_between_lowest_notes.first).step?
+  end
+
   def single_note_between_highest_notes?
     notes_between_highest_notes.length == 1
   end
 
+  def single_note_between_lowest_notes?
+    notes_between_lowest_notes.length == 1
+  end
+
   def notes_between_highest_notes
-    indexes = highest_notes.map { |note| notes.index(note) }
+    notes_between(highest_notes)
+  end
+
+  def notes_between_lowest_notes
+    notes_between(lowest_notes)
+  end
+
+  def notes_between(edge_notes)
+    indexes = edge_notes.map { |note| notes.index(note) }
     notes[(indexes.first + 1)..(indexes.last - 1)] || []
   end
+
+  def only_goes_down?
+    first_note && first_note.pitch == highest_pitch
+  end
 end

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

@@ -2,10 +2,6 @@ module HeadMusic::Style::Annotations
 end
 
 class HeadMusic::Style::Annotations::DirectionChanges < HeadMusic::Style::Annotation
-  MAXIMUM_NOTES_PER_DIRECTION = 3
-
-  MESSAGE = "Balance ascending and descending motion."
-
   def marks
     if overage > 0
       penalty_exponent = overage**0.5
@@ -17,7 +13,7 @@ class HeadMusic::Style::Annotations::DirectionChanges < HeadMusic::Style::Annota
 
   def overage
     return 0 if notes.length < 2
-    [notes_per_direction - MAXIMUM_NOTES_PER_DIRECTION, 0].max
+    [notes_per_direction - self.class.maximum_notes_per_direction, 0].max
   end
 
   def notes_per_direction

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

@@ -0,0 +1,10 @@
+module HeadMusic::Style::Annotations
+end
+
+class HeadMusic::Style::Annotations::FrequentDirectionChanges < HeadMusic::Style::Annotations::DirectionChanges
+  MESSAGE = "Change melodic direction frequently."
+
+  def self.maximum_notes_per_direction
+    3
+  end
+end

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

@@ -0,0 +1,10 @@
+module HeadMusic::Style::Annotations
+end
+
+class HeadMusic::Style::Annotations::ModerateDirectionChanges < HeadMusic::Style::Annotations::DirectionChanges
+  MESSAGE = "Change melodic direction occasionally."
+
+  def self.maximum_notes_per_direction
+    5
+  end
+end

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

@@ -4,8 +4,12 @@ end
 class HeadMusic::Style::Annotations::MostlyConjunct < HeadMusic::Style::Annotation
   MESSAGE = "Use mostly conjunct motion."
 
+  MINIMUM_CONJUNCT_PORTION = HeadMusic::GOLDEN_RATIO_INVERSE ** 2
+  # ~38%
+  # Fux is 5/13 for lydian cantus firmus
+
   def marks
-    marks_for_skips_and_leaps if conjunct_ratio <= 0.5
+    marks_for_skips_and_leaps if conjunct_ratio < MINIMUM_CONJUNCT_PORTION
   end
 
   private
@@ -18,7 +22,6 @@ class HeadMusic::Style::Annotations::MostlyConjunct < HeadMusic::Style::Annotati
 
   def conjunct_ratio
     return 1 if melodic_intervals.empty?
-    steps = melodic_intervals.count { |interval| interval.step? }
-    steps.to_f / melodic_intervals.length
+    melodic_intervals.count(&:step?).to_f / melodic_intervals.length
   end
 end

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

@@ -5,13 +5,33 @@ class HeadMusic::Style::Annotations::NotesSameLength < HeadMusic::Style::Annotat
   MESSAGE = 'Use consistent rhythmic unit.'
 
   def marks
-    preferred_value = first_most_common_rhythmic_value
-    wrong_length_notes = all_but_last_note.select { |note| note.rhythmic_value != preferred_value }
-    HeadMusic::Style::Mark.for_each(wrong_length_notes)
+    HeadMusic::Style::Mark.for_each(all_wrong_length_notes)
   end
 
   private
 
+  def all_wrong_length_notes
+    (wrong_length_notes + [wrong_length_last_note]).compact
+  end
+
+  def wrong_length_notes
+    all_but_last_note.select.with_index do |note|
+      note.rhythmic_value != first_most_common_rhythmic_value
+    end
+  end
+
+  def wrong_length_last_note
+    last_note unless acceptable_duration_of_last_note?
+  end
+
+  def acceptable_duration_of_last_note?
+    last_note.nil? ||
+      [
+        first_most_common_rhythmic_value.total_value,
+        first_most_common_rhythmic_value.total_value * 2
+      ].include?(last_note.rhythmic_value.total_value)
+  end
+
   def all_but_last_note
     notes[0..-2]
   end
@@ -21,9 +41,11 @@ class HeadMusic::Style::Annotations::NotesSameLength < HeadMusic::Style::Annotat
   end
 
   def first_most_common_rhythmic_value
-    candidates = most_common_rhythmic_values
-    first_match = notes.detect { |note| candidates.include?(note.rhythmic_value) }
-    first_match ? first_match.rhythmic_value : nil
+    @first_most_common_rhythmic_value ||= begin
+      candidates = most_common_rhythmic_values
+      first_match = notes.detect { |note| candidates.include?(note.rhythmic_value) }
+      first_match ? first_match.rhythmic_value : nil
+    end
   end
 
   def most_common_rhythmic_values

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

@@ -5,7 +5,7 @@ class HeadMusic::Style::Annotations::PreferImperfect < HeadMusic::Style::Annotat
   MESSAGE = "Prefer imperfect harmonic intervals."
 
   def marks
-    if ratio_of_perfect_intervals > 0.5
+    if ratio_of_perfect_intervals >= 0.5
       HeadMusic::Style::Mark.for_all(perfect_intervals.map(&:notes).flatten)
     end
   end
@@ -13,11 +13,15 @@ class HeadMusic::Style::Annotations::PreferImperfect < HeadMusic::Style::Annotat
   private
 
   def ratio_of_perfect_intervals
-    return 0 if downbeat_harmonic_intervals.empty?
+    return 0 if downbeat_harmonic_intervals_in_middle.nil?
     perfect_intervals.length.to_f / downbeat_harmonic_intervals.length
   end
 
   def perfect_intervals
-    downbeat_harmonic_intervals.select { |interval| interval.perfect_consonance?(:two_part_harmony) }
+    downbeat_harmonic_intervals_in_middle.select { |interval| interval.perfect_consonance?(:two_part_harmony) }
+  end
+
+  def downbeat_harmonic_intervals_in_middle
+    downbeat_harmonic_intervals[1..-2]
   end
 end

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

@@ -0,0 +1,30 @@
+module HeadMusic::Style::Annotations
+end
+
+class HeadMusic::Style::Annotations::PrepareOctaveLeaps < HeadMusic::Style::Annotation
+  MESSAGE = "Enter and exit an octave leap from within."
+
+  def marks
+    (external_entries + external_exits).map do |trouble_spot|
+      HeadMusic::Style::Mark.for_all(trouble_spot)
+    end
+  end
+
+  private
+
+  def external_entries
+    melodic_intervals.map.with_index do |melodic_interval, i|
+      if melodic_interval.octave? && (i == 0 || !melodic_interval.spans?(notes[i-1].pitch))
+        notes[[i-1, 0].max..(i+1)]
+      end
+    end.compact
+  end
+
+  def external_exits
+    melodic_intervals.map.with_index do |melodic_interval, i|
+      if melodic_interval.octave? && (i == (melodic_intervals.length - 1) || !melodic_interval.spans?(notes[i+2].pitch))
+        notes[i..[i+2, notes.length - 1].min]
+      end
+    end.compact
+  end
+end

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

@@ -11,7 +11,7 @@ class HeadMusic::Style::Annotations::RecoverLargeLeaps < HeadMusic::Style::Annot
   def marks
     melodic_intervals.drop(1).to_a.map.with_index do |interval, i|
       previous_interval = melodic_intervals[i]
-      if unrecovered_leap?(previous_interval, interval)
+      if unrecovered_leap?(previous_interval, interval, melodic_intervals[i+2])
         HeadMusic::Style::Mark.for_all((previous_interval.notes + interval.notes).uniq)
       end
     end.compact
@@ -19,20 +19,18 @@ class HeadMusic::Style::Annotations::RecoverLargeLeaps < HeadMusic::Style::Annot
 
   private
 
-  def unrecovered_leap?(first_interval, second_interval)
+  def unrecovered_leap?(first_interval, second_interval, third_interval)
     first_interval.large_leap? &&
-    !spelling_consonant_triad?(first_interval, second_interval) &&
+    !spelling_consonant_triad?(first_interval, second_interval, third_interval) &&
     (
       !direction_changed?(first_interval, second_interval) ||
       !second_interval.step?
     )
   end
 
-  def spelling_consonant_triad?(first_interval, second_interval)
-    return false if first_interval.step? || second_interval.step?
-    pitches = (first_interval.pitches + second_interval.pitches).uniq
-    return false if pitches.length < 3
-    HeadMusic::Chord.new(pitches).consonant_triad?
+  def spelling_consonant_triad?(first_interval, second_interval, third_interval)
+    first_interval.spells_consonant_triad_with?(second_interval) ||
+      second_interval.spells_consonant_triad_with?(third_interval)
   end
 
   def direction_changed?(first_interval, second_interval)

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

@@ -0,0 +1,16 @@
+module HeadMusic::Style::Annotations
+end
+
+class HeadMusic::Style::Annotations::SingleLargeLeaps < HeadMusic::Style::Annotations::RecoverLargeLeaps
+  MESSAGE = "Recover leaps by step, repetition, opposite direction, or spelling triad."
+
+  private
+
+  def unrecovered_leap?(first_interval, second_interval, third_interval)
+    return false unless first_interval.large_leap?
+    return false if spelling_consonant_triad?(first_interval, second_interval, third_interval)
+    return false if second_interval.step?
+    return false if second_interval.repetition?
+    !direction_changed?(first_interval, second_interval) && second_interval.leap?
+  end
+end

data/lib/head_music/style/annotations/{up_to_thirteen_notes.rb → up_to_fourteen_notes.rb}

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

data/lib/head_music/style/mark.rb

@@ -28,4 +28,8 @@ class HeadMusic::Style::Mark
   def code
     [start_position, end_position].join(' to ')
   end
+
+  def to_s
+    code
+  end
 end

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

@@ -0,0 +1,28 @@
+module HeadMusic::Style::Rulesets
+end
+
+class HeadMusic::Style::Rulesets::DavisLybbertCantusFirmus
+  RULESET = [
+    HeadMusic::Style::Annotations::AlwaysMove,
+    HeadMusic::Style::Annotations::AtLeastEightNotes,
+    HeadMusic::Style::Annotations::ConsonantClimax,
+    HeadMusic::Style::Annotations::Diatonic,
+    HeadMusic::Style::Annotations::EndOnTonic,
+    HeadMusic::Style::Annotations::LimitOctaveLeaps,
+    HeadMusic::Style::Annotations::ModerateDirectionChanges,
+    HeadMusic::Style::Annotations::MostlyConjunct,
+    HeadMusic::Style::Annotations::NoRests,
+    HeadMusic::Style::Annotations::NotesSameLength,
+    HeadMusic::Style::Annotations::PrepareOctaveLeaps,
+    HeadMusic::Style::Annotations::SingableIntervals,
+    HeadMusic::Style::Annotations::SingableRange,
+    HeadMusic::Style::Annotations::SingleLargeLeaps,
+    HeadMusic::Style::Annotations::StartOnTonic,
+    HeadMusic::Style::Annotations::StepDownToFinalNote,
+    HeadMusic::Style::Annotations::UpToFourteenNotes,
+  ]
+
+  def self.analyze(voice)
+    RULESET.map { |rule| rule.new(voice) }
+  end
+end

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

@@ -5,13 +5,13 @@ class HeadMusic::Style::Rulesets::FirstSpeciesMelody
   RULESET = [
     HeadMusic::Style::Annotations::ConsonantClimax,
     HeadMusic::Style::Annotations::Diatonic,
-    HeadMusic::Style::Annotations::DirectionChanges,
     HeadMusic::Style::Annotations::EndOnTonic,
+    HeadMusic::Style::Annotations::FrequentDirectionChanges,
     HeadMusic::Style::Annotations::LimitOctaveLeaps,
     HeadMusic::Style::Annotations::MostlyConjunct,
     HeadMusic::Style::Annotations::NoRests,
     HeadMusic::Style::Annotations::NotesSameLength,
-    HeadMusic::Style::Annotations::RecoverLargeLeaps,
+    HeadMusic::Style::Annotations::PrepareOctaveLeaps,
     HeadMusic::Style::Annotations::SingableIntervals,
     HeadMusic::Style::Annotations::SingableRange,
     HeadMusic::Style::Annotations::StartOnPerfectConsonance,

data/lib/head_music/style/rulesets/{cantus_firmus.rb → fux_cantus_firmus.rb}

@@ -1,14 +1,14 @@
 module HeadMusic::Style::Rulesets
 end
 
-class HeadMusic::Style::Rulesets::CantusFirmus
+class HeadMusic::Style::Rulesets::FuxCantusFirmus
   RULESET = [
     HeadMusic::Style::Annotations::AlwaysMove,
     HeadMusic::Style::Annotations::AtLeastEightNotes,
     HeadMusic::Style::Annotations::ConsonantClimax,
     HeadMusic::Style::Annotations::Diatonic,
-    HeadMusic::Style::Annotations::DirectionChanges,
     HeadMusic::Style::Annotations::EndOnTonic,
+    HeadMusic::Style::Annotations::FrequentDirectionChanges,
     HeadMusic::Style::Annotations::LimitOctaveLeaps,
     HeadMusic::Style::Annotations::MostlyConjunct,
     HeadMusic::Style::Annotations::NoRests,
@@ -18,7 +18,7 @@ class HeadMusic::Style::Rulesets::CantusFirmus
     HeadMusic::Style::Annotations::SingableRange,
     HeadMusic::Style::Annotations::StartOnTonic,
     HeadMusic::Style::Annotations::StepDownToFinalNote,
-    HeadMusic::Style::Annotations::UpToThirteenNotes,
+    HeadMusic::Style::Annotations::UpToFourteenNotes,
   ]
 
   def self.analyze(voice)

data/lib/head_music/version.rb

@@ -1,3 +1,3 @@
 module HeadMusic
-  VERSION = "0.14.8"
+  VERSION = "0.16.0"
 end

data/lib/head_music.rb

@@ -1,3 +1,10 @@
+module HeadMusic
+  GOLDEN_RATIO = (1 + 5**0.5) / 2.0
+  GOLDEN_RATIO_INVERSE = 1 / GOLDEN_RATIO
+  PENALTY_FACTOR = GOLDEN_RATIO_INVERSE
+  SMALL_PENALTY_FACTOR = GOLDEN_RATIO_INVERSE**0.5
+end
+
 require 'head_music/version'
 
 require 'active_support/core_ext/module/delegation'
@@ -54,7 +61,9 @@ 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/frequent_direction_changes'
 require 'head_music/style/annotations/limit_octave_leaps'
+require 'head_music/style/annotations/moderate_direction_changes'
 require 'head_music/style/annotations/mostly_conjunct'
 require 'head_music/style/annotations/no_rests'
 require 'head_music/style/annotations/no_unisons_in_middle'
@@ -62,26 +71,22 @@ 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/prepare_octave_leaps'
 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/single_large_leaps'
 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'
+require 'head_music/style/annotations/up_to_fourteen_notes'
 
-require 'head_music/style/rulesets/cantus_firmus'
+require 'head_music/style/rulesets/fux_cantus_firmus'
+require 'head_music/style/rulesets/davis_lybbert_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'
-
-module HeadMusic
-  GOLDEN_RATIO = (1 + 5**0.5) / 2.0
-  GOLDEN_RATIO_INVERSE = 1 / GOLDEN_RATIO
-  PENALTY_FACTOR = GOLDEN_RATIO_INVERSE
-  SMALL_PENALTY_FACTOR = GOLDEN_RATIO_INVERSE**0.5
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: head_music
 version: !ruby/object:Gem::Version
-  version: 0.14.8
+  version: 0.16.0
 platform: ruby
 authors:
 - Rob Head
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-12 00:00:00.000000000 Z
+date: 2017-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -162,7 +162,9 @@ files:
 - 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/frequent_direction_changes.rb
 - lib/head_music/style/annotations/limit_octave_leaps.rb
+- lib/head_music/style/annotations/moderate_direction_changes.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
@@ -170,19 +172,22 @@ files:
 - 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/prepare_octave_leaps.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/single_large_leaps.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/annotations/up_to_fourteen_notes.rb
 - lib/head_music/style/mark.rb
-- lib/head_music/style/rulesets/cantus_firmus.rb
+- lib/head_music/style/rulesets/davis_lybbert_cantus_firmus.rb
 - lib/head_music/style/rulesets/first_species_harmony.rb
 - lib/head_music/style/rulesets/first_species_melody.rb
+- lib/head_music/style/rulesets/fux_cantus_firmus.rb
 - lib/head_music/utilities/hash_key.rb
 - lib/head_music/version.rb
 - lib/head_music/voice.rb