head_music 12.0.1 → 12.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c54b609a69ea91a3d669a6e56f4e0000fb1f03de18554da8c4db7c01ce30655
-  data.tar.gz: 6629c915d4ad4ee0dc66c75247c96687d9d5382e7577a471c7837b47e9c0ebfb
+  metadata.gz: c8f4f677c163723dfa35c168e4094f6dfb883b2817808e0f15fcef4753a2d003
+  data.tar.gz: a9f85adca12a56dbba4f28da4cb44790a793ec9e27de78c3c63900f9b461bac3
 SHA512:
-  metadata.gz: 56f406bb2b9c3320f901929f1783b7a6c9ed6402b2904ae21cefafb9e711126d18720c2ac4c062d3ada15173d0c2889af8afc8c8602d6e74ba7cfb866c04e9f2
-  data.tar.gz: ba7e142a8b553018ddc5a0752572a58e83b89da4ce080eecb353c72e34332ccdb03b3b7d288f81df8e4713f1584770c9777576434ed1f1f03ddce8a731c4d31f
+  metadata.gz: 2ac3464d2b14802c85b7779a11cbd95d8b849ea03b4992501eab1c40b2406e9411c1667de276ae1e95bb996b60f2d0a4e9d3f3b04973b539ba6df4c2462a302e
+  data.tar.gz: 3b6afff57cdcd7fcd343d5da25aad78fa7cbb0a05a74f86197e80b41dee8cf7585170af37ec71aa2da4dfa3ade9e3bcc708e6e6a4d3565507be9ea62d9e9ee79

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    head_music (12.0.1)
+    head_music (12.1.0)
       activesupport (>= 7.0, < 10)
       humanize (~> 2.0)
       i18n (~> 1.8)

data/lib/head_music/style/guidelines/first_bar_entry.rb

@@ -0,0 +1,48 @@
+# Module for style guidelines.
+module HeadMusic::Style::Guidelines; end
+
+# Base class for first-bar guidelines.
+# Rules: (a) at least one note, (b) each note is the correct beat unit,
+# (c) at most one rest, and only on the first beat.
+class HeadMusic::Style::Guidelines::FirstBarEntry < HeadMusic::Style::Annotation
+  def marks
+    return unless notes.any?
+
+    bar_notes = notes_in_first_bar
+    bar_rests = rests_in_first_bar
+    return if valid_first_bar?(bar_notes, bar_rests)
+
+    HeadMusic::Style::Mark.for_all(bar_notes.any? ? bar_notes : [first_note])
+  end
+
+  private
+
+  def expected_rhythmic_value
+    raise NotImplementedError
+  end
+
+  def valid_first_bar?(bar_notes, bar_rests)
+    bar_notes.any? &&
+      all_correct_beat_unit?(bar_notes) &&
+      valid_rests?(bar_rests)
+  end
+
+  def all_correct_beat_unit?(bar_notes)
+    bar_notes.all? { |note| note.rhythmic_value == expected_rhythmic_value }
+  end
+
+  def valid_rests?(bar_rests)
+    bar_rests.empty? ||
+      (bar_rests.length == 1 &&
+        bar_rests.first.position.count == 1 &&
+        bar_rests.first.rhythmic_value == expected_rhythmic_value)
+  end
+
+  def notes_in_first_bar
+    notes.select { |note| note.position.bar_number == 1 }
+  end
+
+  def rests_in_first_bar
+    rests.select { |rest| rest.position.bar_number == 1 }
+  end
+end

data/lib/head_music/style/guidelines/first_bar_half_notes.rb

@@ -0,0 +1,13 @@
+# Module for style guidelines.
+module HeadMusic::Style::Guidelines; end
+
+# Checks that the first bar contains half notes, with an optional half rest on beat one.
+class HeadMusic::Style::Guidelines::FirstBarHalfNotes < HeadMusic::Style::Guidelines::FirstBarEntry
+  MESSAGE = "Begin the first bar with half notes, or enter after a half rest."
+
+  private
+
+  def expected_rhythmic_value
+    HeadMusic::Rudiment::RhythmicValue.get(:half)
+  end
+end

data/lib/head_music/style/guidelines/first_bar_quarter_notes.rb

@@ -0,0 +1,13 @@
+# Module for style guidelines.
+module HeadMusic::Style::Guidelines; end
+
+# Checks that the first bar contains quarter notes, with an optional quarter rest on beat one.
+class HeadMusic::Style::Guidelines::FirstBarQuarterNotes < HeadMusic::Style::Guidelines::FirstBarEntry
+  MESSAGE = "Begin the first bar with quarter notes, or enter after a quarter rest."
+
+  private
+
+  def expected_rhythmic_value
+    HeadMusic::Rudiment::RhythmicValue.get(:quarter)
+  end
+end

data/lib/head_music/style/guidelines/first_bar_whole_note.rb

@@ -0,0 +1,13 @@
+# Module for style guidelines.
+module HeadMusic::Style::Guidelines; end
+
+# Checks that the first bar contains a whole note.
+class HeadMusic::Style::Guidelines::FirstBarWholeNote < HeadMusic::Style::Guidelines::FirstBarEntry
+  MESSAGE = "Begin with a whole note in the first bar."
+
+  private
+
+  def expected_rhythmic_value
+    HeadMusic::Rudiment::RhythmicValue.get(:whole)
+  end
+end

data/lib/head_music/style/guidelines/four_per_bar.rb

@@ -0,0 +1,18 @@
+# Module for style guidelines.
+module HeadMusic::Style::Guidelines; end
+
+# Checks that each middle bar contains exactly four quarter notes.
+class HeadMusic::Style::Guidelines::FourPerBar < HeadMusic::Style::Guidelines::NoteCountPerBar
+  MESSAGE = "Use four quarter notes in each middle bar."
+
+  QUARTER = HeadMusic::Rudiment::RhythmicValue.get(:quarter)
+
+  private
+
+  def check_middle_bar(bar_number)
+    bar_notes = notes_in_bar(bar_number)
+    return if bar_notes.length == 4 && bar_notes.all? { |note| note.rhythmic_value == QUARTER }
+
+    mark_bar(bar_number)
+  end
+end

data/lib/head_music/style/guidelines/note_count_per_bar.rb

@@ -1,47 +1,27 @@
 # Module for style guidelines.
 module HeadMusic::Style::Guidelines; end
 
-# Base class for guidelines that check note counts per bar against the cantus firmus.
+# Base class for guidelines that check note counts in middle bars (not first or last).
 class HeadMusic::Style::Guidelines::NoteCountPerBar < HeadMusic::Style::Annotation
-  WHOLE = HeadMusic::Rudiment::RhythmicValue.get(:whole)
-
   def marks
     return [] unless cantus_firmus&.notes&.any?
 
-    cf_notes = cantus_firmus.notes
-    cf_notes.each_with_index.filter_map do |cf_note, index|
-      bar_number = cf_note.position.bar_number
-      if index == cf_notes.length - 1
-        check_final_bar(bar_number)
-      elsif index == 0
-        check_first_bar(bar_number)
-      else
-        check_middle_bar(bar_number)
-      end
-    end
+    middle_bars.filter_map { |bar_number| check_middle_bar(bar_number) }
   end
 
   private
 
-  def check_final_bar(bar_number)
-    bar_notes = notes_in_bar(bar_number)
-    return if one_whole_note?(bar_notes)
-
-    mark_bar(bar_number)
-  end
+  def middle_bars
+    cf_notes = cantus_firmus.notes
+    return [] if cf_notes.length <= 2
 
-  def one_whole_note?(bar_notes)
-    bar_notes.length == 1 && bar_notes.first.rhythmic_value == WHOLE
+    cf_notes[1..-2].map { |note| note.position.bar_number }
   end
 
   def notes_in_bar(bar_number)
     notes.select { |note| note.position.bar_number == bar_number }
   end
 
-  def rests_in_bar(bar_number)
-    rests.select { |rest| rest.position.bar_number == bar_number }
-  end
-
   def mark_bar(bar_number)
     bar_placements = notes_in_bar(bar_number)
     if bar_placements.any?

data/lib/head_music/style/guidelines/note_fills_final_bar.rb

@@ -0,0 +1,35 @@
+# Module for style guidelines.
+module HeadMusic::Style::Guidelines; end
+
+# Checks that the final bar contains a single note that fills the entire measure.
+class HeadMusic::Style::Guidelines::NoteFillsFinalBar < HeadMusic::Style::Annotation
+  MESSAGE = "End with a single note that fills the final bar."
+
+  def marks
+    return unless notes.any?
+
+    bar_notes = notes_in_final_bar
+    return if bar_notes.length == 1 && fills_bar?(bar_notes.first)
+
+    HeadMusic::Style::Mark.for_all(bar_notes.any? ? bar_notes : [last_note])
+  end
+
+  private
+
+  def notes_in_final_bar
+    notes.select { |note| note.position.bar_number == final_bar_number }
+  end
+
+  def final_bar_number
+    last_note.position.bar_number
+  end
+
+  def fills_bar?(note)
+    note.rhythmic_value.total_value == bar_duration
+  end
+
+  def bar_duration
+    meter = composition.meter_at(final_bar_number)
+    meter.count_unit.relative_value * meter.counts_per_bar
+  end
+end

data/lib/head_music/style/guidelines/one_per_bar.rb

@@ -0,0 +1,18 @@
+# Module for style guidelines.
+module HeadMusic::Style::Guidelines; end
+
+# Checks that each middle bar contains exactly one whole note.
+class HeadMusic::Style::Guidelines::OnePerBar < HeadMusic::Style::Guidelines::NoteCountPerBar
+  MESSAGE = "Use one whole note in each middle bar."
+
+  WHOLE = HeadMusic::Rudiment::RhythmicValue.get(:whole)
+
+  private
+
+  def check_middle_bar(bar_number)
+    bar_notes = notes_in_bar(bar_number)
+    return if bar_notes.length == 1 && bar_notes.first.rhythmic_value == WHOLE
+
+    mark_bar(bar_number)
+  end
+end

data/lib/head_music/style/guidelines/three_per_bar.rb

@@ -0,0 +1,18 @@
+# Module for style guidelines.
+module HeadMusic::Style::Guidelines; end
+
+# Checks that each middle bar contains exactly three quarter notes.
+class HeadMusic::Style::Guidelines::ThreePerBar < HeadMusic::Style::Guidelines::NoteCountPerBar
+  MESSAGE = "Use three quarter notes in each middle bar."
+
+  QUARTER = HeadMusic::Rudiment::RhythmicValue.get(:quarter)
+
+  private
+
+  def check_middle_bar(bar_number)
+    bar_notes = notes_in_bar(bar_number)
+    return if bar_notes.length == 3 && bar_notes.all? { |note| note.rhythmic_value == QUARTER }
+
+    mark_bar(bar_number)
+  end
+end

data/lib/head_music/style/guidelines/two_per_bar.rb

@@ -0,0 +1,18 @@
+# Module for style guidelines.
+module HeadMusic::Style::Guidelines; end
+
+# Checks that each middle bar contains exactly two half notes.
+class HeadMusic::Style::Guidelines::TwoPerBar < HeadMusic::Style::Guidelines::NoteCountPerBar
+  MESSAGE = "Use two half notes in each middle bar."
+
+  HALF = HeadMusic::Rudiment::RhythmicValue.get(:half)
+
+  private
+
+  def check_middle_bar(bar_number)
+    bar_notes = notes_in_bar(bar_number)
+    return if bar_notes.length == 2 && bar_notes.all? { |note| note.rhythmic_value == HALF }
+
+    mark_bar(bar_number)
+  end
+end

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

@@ -7,11 +7,12 @@ class HeadMusic::Style::Guides::FirstSpeciesMelody < HeadMusic::Style::Guides::S
     HeadMusic::Style::Guidelines::ConsonantClimax,
     HeadMusic::Style::Guidelines::Diatonic,
     HeadMusic::Style::Guidelines::EndOnTonic,
+    HeadMusic::Style::Guidelines::NoteFillsFinalBar,
+    HeadMusic::Style::Guidelines::FirstBarWholeNote,
     HeadMusic::Style::Guidelines::FrequentDirectionChanges,
     HeadMusic::Style::Guidelines::LimitOctaveLeaps,
     HeadMusic::Style::Guidelines::MostlyConjunct,
-    HeadMusic::Style::Guidelines::NoRests,
-    HeadMusic::Style::Guidelines::NotesSameLength,
+    HeadMusic::Style::Guidelines::OnePerBar,
     HeadMusic::Style::Guidelines::PrepareOctaveLeaps,
     HeadMusic::Style::Guidelines::SingableIntervals,
     HeadMusic::Style::Guidelines::SingableRange,

data/lib/head_music/style/guides/second_species_melody.rb

@@ -8,6 +8,8 @@ class HeadMusic::Style::Guides::SecondSpeciesMelody < HeadMusic::Style::Guides::
     HeadMusic::Style::Guidelines::ConsonantClimax,
     HeadMusic::Style::Guidelines::Diatonic,
     HeadMusic::Style::Guidelines::EndOnTonic,
+    HeadMusic::Style::Guidelines::NoteFillsFinalBar,
+    HeadMusic::Style::Guidelines::FirstBarHalfNotes,
     HeadMusic::Style::Guidelines::FrequentDirectionChanges,
     HeadMusic::Style::Guidelines::LimitOctaveLeaps,
     HeadMusic::Style::Guidelines::MostlyConjunct,
@@ -17,6 +19,6 @@ class HeadMusic::Style::Guides::SecondSpeciesMelody < HeadMusic::Style::Guides::
     HeadMusic::Style::Guidelines::StartOnPerfectConsonance,
     HeadMusic::Style::Guidelines::StepOutOfUnison,
     HeadMusic::Style::Guidelines::StepUpToFinalNote,
-    HeadMusic::Style::Guidelines::TwoToOne
+    HeadMusic::Style::Guidelines::TwoPerBar
   ].freeze
 end

data/lib/head_music/style/guides/third_species_melody.rb

@@ -8,7 +8,9 @@ class HeadMusic::Style::Guides::ThirdSpeciesMelody < HeadMusic::Style::Guides::S
     HeadMusic::Style::Guidelines::ConsonantClimax,
     HeadMusic::Style::Guidelines::Diatonic,
     HeadMusic::Style::Guidelines::EndOnTonic,
-    HeadMusic::Style::Guidelines::FourToOne,
+    HeadMusic::Style::Guidelines::NoteFillsFinalBar,
+    HeadMusic::Style::Guidelines::FirstBarQuarterNotes,
+    HeadMusic::Style::Guidelines::FourPerBar,
     HeadMusic::Style::Guidelines::FrequentDirectionChanges,
     HeadMusic::Style::Guidelines::LimitOctaveLeaps,
     HeadMusic::Style::Guidelines::MostlyConjunct,

data/lib/head_music/style/guides/third_species_triple_meter_melody.rb

@@ -8,6 +8,8 @@ class HeadMusic::Style::Guides::ThirdSpeciesTripleMeterMelody < HeadMusic::Style
     HeadMusic::Style::Guidelines::ConsonantClimax,
     HeadMusic::Style::Guidelines::Diatonic,
     HeadMusic::Style::Guidelines::EndOnTonic,
+    HeadMusic::Style::Guidelines::NoteFillsFinalBar,
+    HeadMusic::Style::Guidelines::FirstBarQuarterNotes,
     HeadMusic::Style::Guidelines::FrequentDirectionChanges,
     HeadMusic::Style::Guidelines::LimitOctaveLeaps,
     HeadMusic::Style::Guidelines::MostlyConjunct,
@@ -17,6 +19,6 @@ class HeadMusic::Style::Guides::ThirdSpeciesTripleMeterMelody < HeadMusic::Style
     HeadMusic::Style::Guidelines::StartOnPerfectConsonance,
     HeadMusic::Style::Guidelines::StepOutOfUnison,
     HeadMusic::Style::Guidelines::StepUpToFinalNote,
-    HeadMusic::Style::Guidelines::ThreeToOne
+    HeadMusic::Style::Guidelines::ThreePerBar
   ].freeze
 end

data/lib/head_music/version.rb

@@ -1,3 +1,3 @@
 module HeadMusic
-  VERSION = "12.0.1"
+  VERSION = "12.1.0"
 end

data/lib/head_music.rb

@@ -161,8 +161,14 @@ require "head_music/style/guidelines/diatonic"
 require "head_music/style/guidelines/direction_changes"
 require "head_music/style/guidelines/end_on_perfect_consonance"
 require "head_music/style/guidelines/end_on_tonic"
+require "head_music/style/guidelines/note_fills_final_bar"
+require "head_music/style/guidelines/first_bar_entry"
+require "head_music/style/guidelines/first_bar_half_notes"
+require "head_music/style/guidelines/first_bar_quarter_notes"
+require "head_music/style/guidelines/first_bar_whole_note"
 require "head_music/style/guidelines/note_count_per_bar"
-require "head_music/style/guidelines/four_to_one"
+require "head_music/style/guidelines/one_per_bar"
+require "head_music/style/guidelines/four_per_bar"
 require "head_music/style/guidelines/frequent_direction_changes"
 require "head_music/style/guidelines/limit_octave_leaps"
 require "head_music/style/guidelines/moderate_direction_changes"
@@ -188,8 +194,8 @@ require "head_music/style/guidelines/step_down_to_final_note"
 require "head_music/style/guidelines/step_out_of_unison"
 require "head_music/style/guidelines/step_to_final_note"
 require "head_music/style/guidelines/step_up_to_final_note"
-require "head_music/style/guidelines/three_to_one"
-require "head_music/style/guidelines/two_to_one"
+require "head_music/style/guidelines/three_per_bar"
+require "head_music/style/guidelines/two_per_bar"
 require "head_music/style/guidelines/up_to_fourteen_notes"
 require "head_music/style/guidelines/weak_beat_dissonance_treatment"
 require "head_music/style/guidelines/third_species_dissonance_treatment"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: head_music
 version: !ruby/object:Gem::Version
-  version: 12.0.1
+  version: 12.1.0
 platform: ruby
 authors:
 - Rob Head
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-02-23 00:00:00.000000000 Z
+date: 2026-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -280,7 +280,11 @@ files:
 - lib/head_music/style/guidelines/directional_step_to_final_note.rb
 - lib/head_music/style/guidelines/end_on_perfect_consonance.rb
 - lib/head_music/style/guidelines/end_on_tonic.rb
-- lib/head_music/style/guidelines/four_to_one.rb
+- lib/head_music/style/guidelines/first_bar_entry.rb
+- lib/head_music/style/guidelines/first_bar_half_notes.rb
+- lib/head_music/style/guidelines/first_bar_quarter_notes.rb
+- lib/head_music/style/guidelines/first_bar_whole_note.rb
+- lib/head_music/style/guidelines/four_per_bar.rb
 - lib/head_music/style/guidelines/frequent_direction_changes.rb
 - lib/head_music/style/guidelines/limit_octave_leaps.rb
 - lib/head_music/style/guidelines/moderate_direction_changes.rb
@@ -291,7 +295,9 @@ files:
 - lib/head_music/style/guidelines/no_strong_beat_unisons.rb
 - lib/head_music/style/guidelines/no_unisons_in_middle.rb
 - lib/head_music/style/guidelines/note_count_per_bar.rb
+- lib/head_music/style/guidelines/note_fills_final_bar.rb
 - lib/head_music/style/guidelines/notes_same_length.rb
+- lib/head_music/style/guidelines/one_per_bar.rb
 - lib/head_music/style/guidelines/one_to_one.rb
 - lib/head_music/style/guidelines/prefer_contrary_motion.rb
 - lib/head_music/style/guidelines/prefer_imperfect.rb
@@ -307,9 +313,9 @@ files:
 - lib/head_music/style/guidelines/step_to_final_note.rb
 - lib/head_music/style/guidelines/step_up_to_final_note.rb
 - lib/head_music/style/guidelines/third_species_dissonance_treatment.rb
-- lib/head_music/style/guidelines/three_to_one.rb
+- lib/head_music/style/guidelines/three_per_bar.rb
 - lib/head_music/style/guidelines/triple_meter_dissonance_treatment.rb
-- lib/head_music/style/guidelines/two_to_one.rb
+- lib/head_music/style/guidelines/two_per_bar.rb
 - lib/head_music/style/guidelines/up_to_fourteen_notes.rb
 - lib/head_music/style/guidelines/weak_beat_dissonance_treatment.rb
 - lib/head_music/style/guides/first_species_harmony.rb

data/lib/head_music/style/guidelines/four_to_one.rb

@@ -1,45 +0,0 @@
-# Module for style guidelines.
-module HeadMusic::Style::Guidelines; end
-
-# A counterpoint guideline
-class HeadMusic::Style::Guidelines::FourToOne < HeadMusic::Style::Guidelines::NoteCountPerBar
-  MESSAGE = "Use four quarter notes against each whole note in the cantus firmus."
-
-  QUARTER = HeadMusic::Rudiment::RhythmicValue.get(:quarter)
-
-  private
-
-  def check_first_bar(bar_number)
-    bar_notes = notes_in_bar(bar_number)
-    bar_rests = rests_in_bar(bar_number)
-    return if four_quarter_notes?(bar_notes)
-    return if rest_then_three_quarter_notes?(bar_notes, bar_rests)
-    return if three_quarter_notes_after_downbeat?(bar_notes)
-
-    mark_bar(bar_number)
-  end
-
-  def check_middle_bar(bar_number)
-    bar_notes = notes_in_bar(bar_number)
-    return if four_quarter_notes?(bar_notes)
-
-    mark_bar(bar_number)
-  end
-
-  def four_quarter_notes?(bar_notes)
-    bar_notes.length == 4 && bar_notes.all? { |note| note.rhythmic_value == QUARTER }
-  end
-
-  def rest_then_three_quarter_notes?(bar_notes, bar_rests)
-    bar_notes.length == 3 &&
-      bar_notes.all? { |note| note.rhythmic_value == QUARTER } &&
-      bar_rests.length == 1 &&
-      bar_rests.first.rhythmic_value == QUARTER
-  end
-
-  def three_quarter_notes_after_downbeat?(bar_notes)
-    bar_notes.length == 3 &&
-      bar_notes.all? { |note| note.rhythmic_value == QUARTER } &&
-      bar_notes.first.position.count > 1
-  end
-end

data/lib/head_music/style/guidelines/three_to_one.rb

@@ -1,57 +0,0 @@
-# Module for style guidelines.
-module HeadMusic::Style::Guidelines; end
-
-# A counterpoint guideline
-class HeadMusic::Style::Guidelines::ThreeToOne < HeadMusic::Style::Guidelines::NoteCountPerBar
-  MESSAGE = "Use three quarter notes against each dotted half note in the cantus firmus."
-
-  QUARTER = HeadMusic::Rudiment::RhythmicValue.get(:quarter)
-  DOTTED_HALF = HeadMusic::Rudiment::RhythmicValue.get(:dotted_half)
-
-  private
-
-  def check_first_bar(bar_number)
-    bar_notes = notes_in_bar(bar_number)
-    bar_rests = rests_in_bar(bar_number)
-    return if three_quarter_notes?(bar_notes)
-    return if rest_then_two_quarter_notes?(bar_notes, bar_rests)
-    return if two_quarter_notes_after_downbeat?(bar_notes)
-
-    mark_bar(bar_number)
-  end
-
-  def check_middle_bar(bar_number)
-    bar_notes = notes_in_bar(bar_number)
-    return if three_quarter_notes?(bar_notes)
-
-    mark_bar(bar_number)
-  end
-
-  def check_final_bar(bar_number)
-    bar_notes = notes_in_bar(bar_number)
-    return if one_dotted_half_note?(bar_notes)
-
-    mark_bar(bar_number)
-  end
-
-  def three_quarter_notes?(bar_notes)
-    bar_notes.length == 3 && bar_notes.all? { |note| note.rhythmic_value == QUARTER }
-  end
-
-  def rest_then_two_quarter_notes?(bar_notes, bar_rests)
-    bar_notes.length == 2 &&
-      bar_notes.all? { |note| note.rhythmic_value == QUARTER } &&
-      bar_rests.length == 1 &&
-      bar_rests.first.rhythmic_value == QUARTER
-  end
-
-  def two_quarter_notes_after_downbeat?(bar_notes)
-    bar_notes.length == 2 &&
-      bar_notes.all? { |note| note.rhythmic_value == QUARTER } &&
-      bar_notes.first.position.count > 1
-  end
-
-  def one_dotted_half_note?(bar_notes)
-    bar_notes.length == 1 && bar_notes.first.rhythmic_value == DOTTED_HALF
-  end
-end

data/lib/head_music/style/guidelines/two_to_one.rb

@@ -1,46 +0,0 @@
-# Module for style guidelines.
-module HeadMusic::Style::Guidelines; end
-
-# A counterpoint guideline
-class HeadMusic::Style::Guidelines::TwoToOne < HeadMusic::Style::Guidelines::NoteCountPerBar
-  MESSAGE = "Use two half notes against each whole note in the cantus firmus."
-
-  HALF = HeadMusic::Rudiment::RhythmicValue.get(:half)
-
-  private
-
-  def check_first_bar(bar_number)
-    bar_notes = notes_in_bar(bar_number)
-    bar_rests = rests_in_bar(bar_number)
-    return if two_half_notes?(bar_notes)
-    return if rest_then_half_note?(bar_notes, bar_rests)
-    return if single_half_note_after_downbeat?(bar_notes)
-
-    mark_bar(bar_number)
-  end
-
-  def check_middle_bar(bar_number)
-    bar_notes = notes_in_bar(bar_number)
-    return if two_half_notes?(bar_notes)
-
-    mark_bar(bar_number)
-  end
-
-  def two_half_notes?(bar_notes)
-    bar_notes.length == 2 && bar_notes.all? { |note| note.rhythmic_value == HALF }
-  end
-
-  def rest_then_half_note?(bar_notes, bar_rests)
-    bar_notes.length == 1 &&
-      bar_notes.first.rhythmic_value == HALF &&
-      bar_rests.length == 1 &&
-      bar_rests.first.rhythmic_value == HALF
-  end
-
-  def single_half_note_after_downbeat?(bar_notes)
-    first_note = bar_notes.first
-    bar_notes.length == 1 &&
-      first_note.rhythmic_value == HALF &&
-      first_note.position.count > 1
-  end
-end