head_music 12.5.0 → 12.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a02a5ef281eecc76bcf953aa51c04078858b4588f2b85c0b1a4d1f4d88464d6
-  data.tar.gz: 5a31a94133ffbb97944524d75aedcbbfcbf7ce769fe6049559818a1940438442
+  metadata.gz: db91f6ff65b081bb369f3d2a85e2bc6e6cd092bb0018c2c416bf36bcfc4d4e9d
+  data.tar.gz: 266914dfbc382dc27591ea37302b57571b8693f2e0e4bd5189d2fffdff2a7c00
 SHA512:
-  metadata.gz: 369c959ae6f69cd609a65e4dee6b4aace0283d107132fec61f3b35afadfeb27d5386c60e969d88cfe626bdc0873e3c5dbed736513d93523e68c5dfca4127b6f1
-  data.tar.gz: 0f04cf766ce824188270ad00fe29866f652befcb0ff0d5c3eeaadd21e286b088bfb8883fe8687f94c0eaf2e216c5a2ee0377afc91756df18e9e587b5fef0eb41
+  metadata.gz: d53ea28ee01b301ae1070a94fe8929d00b649c7d581976183d20e0bbfd080ccf4c08003719f2280001fb7d6ed00cfe1a5a634bd69b046d5859db56dfab6c6bb5
+  data.tar.gz: 9cd2929bddff0033d3caa84832e97a77a920cfc61e4e2d55d4d0be338f1ef7904beaad73748f6d6cc4ef93aea5a3b06292e16b285d0b61d5ad78b4ba2818932b

data/CHANGELOG.md

@@ -7,6 +7,116 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [12.6.0] - 2026-07-03
+
+### Added
+
+- `DiatonicMelody` guide: a free diatonic melody not bound to cantus firmus start/end constraints (note-count range configurable, defaulting to 5–24)
+- Configurable guidelines — a guideline can now carry configuration into a `RULESET` via `Annotation.with(...)` (wrapped in `Annotation::Configured`):
+  - `MinimumNotes` / `MaximumNotes` — configurable note-count floor and ceiling (`AtLeastEightNotes` / `UpToFourteenNotes` retained as named defaults)
+  - `NoteCountPerBar` — configurable `count` and `rhythmic_value` (unifies `OnePerBar`, `TwoPerBar`, `ThreePerBar`, `FourPerBar`)
+  - `DirectionChanges` — configurable `maximum_notes_per_direction` (unifies `ModerateDirectionChanges` and `FrequentDirectionChanges`)
+  - Configurable thresholds on `SingableRange`, `MostlyConjunct`, `LimitOctaveLeaps`, and `SecondSpeciesBreak`
+
+### Changed
+
+- Extracted `HeadMusic::Style::Guides::Base` for shared guide analysis behavior; `SpeciesMelody` and `SpeciesHarmony` now inherit from it
+- Hoisted the guidelines common to every guide into `MELODIC_CORE` / `HARMONIC_CORE` constants on the species base classes
+- `SingableRange`'s message now reflects the configured range
+- Renamed the `quality` rake task to `validate`
+
+## [12.5.0] - 2026-04-08
+
+### Changed
+
+- Improved fifth-species counterpoint guidelines
+- Code quality improvements
+
+### Removed
+
+- Combined 2+3+4 species guides and their guidelines
+
+## [12.4.0] - 2026-04-06
+
+### Added
+
+- Fifth-species (florid) counterpoint guides
+- Standard and alternate instrument tunings
+
+### Fixed
+
+- Ukulele family stringings, tunings, and range data
+
+## [12.3.0] - 2026-02-25
+
+### Added
+
+- Fourth-species counterpoint guides
+
+### Changed
+
+- Code quality pass
+
+## [12.2.0] - 2026-02-24
+
+### Changed
+
+- Improved guidelines for first-bar entry
+
+## [12.1.0] - 2026-02-24
+
+### Changed
+
+- Refactored species guidelines into separate first-bar, middle-bar, and final-bar rules
+- Unified `FinalBarWholeNote` and `FinalBarDottedHalfNote` into `NoteFillsFinalBar`
+
+## [12.0.1] - 2026-02-23
+
+### Changed
+
+- Renamed triple-meter guides
+
+## [12.0.0] - 2026-02-21
+
+### Added
+
+- Third-species 3:1 guidelines
+- Allow a descending minor sixth as a singable interval
+
+### Changed
+
+- Extracted shared base classes for guides and step-to-final-note guidelines
+- Refactored third-species dissonance handling and other files to reduce code smells
+
+## [11.8.0] - 2026-02-16
+
+### Added
+
+- `ThirdSpeciesMelody` and `ThirdSpeciesHarmony` guides
+- `ThirdSpeciesDissonanceTreatment` guideline
+- `FourToOne` guideline
+- Third-species counterpoint reference document
+
+## [11.7.0] - 2026-02-13
+
+### Added
+
+- Parallel-perfect check for first species
+
+### Changed
+
+- `Analysis#fitness` now uses the geometric mean
+
+## [11.6.1] - 2026-02-12
+
+### Added
+
+- Additional test coverage for the two-to-one guideline
+
+### Fixed
+
+- Accept an implied rest in the first bar of second-species counterpoint
+
 ## [11.6.0] - 2026-02-10
 
 ### Added

data/CLAUDE.md

@@ -26,8 +26,8 @@ bundle exec rspec spec/head_music/rudiments/pitch_spec.rb
 # Run linting
 bundle exec rubocop
 
-# Run all quality checks (tests, linting, security)
-bundle exec rake quality
+# Run all validation checks (tests, linting, security)
+bundle exec rake validate
 
 # Open interactive console with gem loaded
 bin/console

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    head_music (12.5.0)
+    head_music (12.6.0)
       activesupport (>= 7.0, < 10)
       humanize (~> 2.0)
       i18n (~> 1.8)
@@ -211,6 +211,7 @@ GEM
 PLATFORMS
   arm64-darwin-22
   arm64-darwin-23
+  arm64-darwin-25
   x86_64-linux
 
 DEPENDENCIES

data/Rakefile

@@ -33,8 +33,8 @@ end
 
 task default: :spec
 
-desc "Run all quality checks (tests, linting, security audit, code quality)"
-task quality: [:spec, :standard, "bundle:audit:check", :rubycritic]
+desc "Run all validation checks (tests, linting, security audit, code quality)"
+task validate: [:spec, :standard, "bundle:audit:check", :rubycritic]
 
 desc "Open an irb session preloaded with this library"
 task :console do

data/lib/head_music/style/annotation.rb

@@ -23,8 +23,36 @@ class HeadMusic::Style::Annotation
   delegate :key_signature, to: :composition
   delegate :tonic_spelling, to: :key_signature
 
-  def initialize(voice)
+  def initialize(voice, **options)
     @voice = voice
+    @options = options
+  end
+
+  # Wraps a guideline class with preset options so it can live in a RULESET
+  # and still be instantiated with just a voice, e.g. MinimumNotes.with(minimum: 5).
+  def self.with(**options)
+    Configured.new(self, options)
+  end
+
+  # A RULESET entry pairing a guideline class with configuration. Quacks like a
+  # class to the analyze loop by responding to #new(voice).
+  class Configured
+    attr_reader :guideline_class, :options
+
+    def initialize(guideline_class, options)
+      @guideline_class = guideline_class
+      @options = options
+    end
+
+    def new(voice)
+      guideline_class.new(voice, **options)
+    end
+
+    def name
+      guideline_class.name
+    end
+    alias_method :to_s, :name
+    alias_method :inspect, :name
   end
 
   def fitness
@@ -61,6 +89,8 @@ class HeadMusic::Style::Annotation
 
   protected
 
+  attr_reader :options
+
   def voices
     @voices ||= voice.composition.voices
   end

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

@@ -1,29 +1,7 @@
 # Module for style guidelines.
 module HeadMusic::Style::Guidelines; end
 
-# A counterpoint guideline
-class HeadMusic::Style::Guidelines::AtLeastEightNotes < HeadMusic::Style::Annotation
+# A counterpoint guideline: the cantus firmus should have at least eight notes.
+class HeadMusic::Style::Guidelines::AtLeastEightNotes < HeadMusic::Style::Guidelines::MinimumNotes
   MINIMUM_NOTES = 8
-
-  MESSAGE = "Write at least eight notes."
-
-  def marks
-    placements.empty? ? no_placements_mark : deficiency_mark
-  end
-
-  private
-
-  def no_placements_mark
-    HeadMusic::Style::Mark.new(
-      HeadMusic::Content::Position.new(composition, "1:1"),
-      HeadMusic::Content::Position.new(composition, "2:1"),
-      fitness: 0
-    )
-  end
-
-  def deficiency_mark
-    return unless notes.length < MINIMUM_NOTES
-
-    HeadMusic::Style::Mark.for_all(placements, fitness: notes.length.to_f / MINIMUM_NOTES)
-  end
 end

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

@@ -1,8 +1,12 @@
 # Module for style guidelines.
 module HeadMusic::Style::Guidelines; end
 
-# A melodic line should have direction changes.
+# A melodic line should change direction often enough. Configurable via the
+# `maximum_notes_per_direction:` option; subclasses may set a
+# MAXIMUM_NOTES_PER_DIRECTION default and their own MESSAGE.
 class HeadMusic::Style::Guidelines::DirectionChanges < HeadMusic::Style::Annotation
+  MESSAGE = "Change melodic direction regularly."
+
   def marks
     return unless overage.positive?
 
@@ -15,7 +19,11 @@ class HeadMusic::Style::Guidelines::DirectionChanges < HeadMusic::Style::Annotat
   def overage
     return 0 if notes.length < 2
 
-    [notes_per_direction - self.class.maximum_notes_per_direction, 0].max
+    [notes_per_direction - maximum_notes_per_direction, 0].max
+  end
+
+  def maximum_notes_per_direction
+    options.fetch(:maximum_notes_per_direction) { self.class::MAXIMUM_NOTES_PER_DIRECTION }
   end
 
   def notes_per_direction

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

@@ -3,16 +3,6 @@ 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
+  COUNT = 4
+  RHYTHMIC_VALUE = :quarter
 end

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

@@ -4,8 +4,5 @@ module HeadMusic::Style::Guidelines; end
 # A counterpoint guideline
 class HeadMusic::Style::Guidelines::FrequentDirectionChanges < HeadMusic::Style::Guidelines::DirectionChanges
   MESSAGE = "Change melodic direction frequently."
-
-  def self.maximum_notes_per_direction
-    3
-  end
+  MAXIMUM_NOTES_PER_DIRECTION = 3
 end

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

@@ -2,19 +2,28 @@
 module HeadMusic::Style::Guidelines; end
 
 # A counterpoint guideline: Use a maximum of one octave leap.
+# Configurable via the `maximum_leaps:` option.
 class HeadMusic::Style::Guidelines::LimitOctaveLeaps < HeadMusic::Style::Annotation
-  MESSAGE = "Use a maximum of one octave leap."
+  MAXIMUM_LEAPS = 1
 
   def marks
-    return if octave_leaps.length <= 1
+    return if octave_leaps.length <= maximum_leaps
 
     octave_leaps.map do |leap|
       HeadMusic::Style::Mark.for_all(leap.notes)
     end
   end
 
+  def message
+    "Use a maximum of #{maximum_leaps.humanize} octave #{(maximum_leaps == 1) ? "leap" : "leaps"}."
+  end
+
   private
 
+  def maximum_leaps
+    options.fetch(:maximum_leaps) { self.class::MAXIMUM_LEAPS }
+  end
+
   def octave_leaps
     melodic_note_pairs.select(&:octave?)
   end

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

@@ -0,0 +1,24 @@
+# Module for style guidelines.
+module HeadMusic::Style::Guidelines; end
+
+# Flags a melody with more than the allowed number of notes.
+# Configurable via the `maximum:` option; subclasses may set a MAXIMUM_NOTES default.
+class HeadMusic::Style::Guidelines::MaximumNotes < HeadMusic::Style::Annotation
+  def marks
+    HeadMusic::Style::Mark.for_each(notes[maximum..]) if overage.positive?
+  end
+
+  def message
+    "Write up to #{maximum.humanize} notes."
+  end
+
+  private
+
+  def maximum
+    options.fetch(:maximum) { self.class::MAXIMUM_NOTES }
+  end
+
+  def overage
+    [notes.length - maximum, 0].max
+  end
+end

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

@@ -0,0 +1,34 @@
+# Module for style guidelines.
+module HeadMusic::Style::Guidelines; end
+
+# Flags a melody with fewer than the required number of notes.
+# Configurable via the `minimum:` option; subclasses may set a MINIMUM_NOTES default.
+class HeadMusic::Style::Guidelines::MinimumNotes < HeadMusic::Style::Annotation
+  def marks
+    placements.empty? ? no_placements_mark : deficiency_mark
+  end
+
+  def message
+    "Write at least #{minimum.humanize} notes."
+  end
+
+  private
+
+  def minimum
+    options.fetch(:minimum) { self.class::MINIMUM_NOTES }
+  end
+
+  def no_placements_mark
+    HeadMusic::Style::Mark.new(
+      HeadMusic::Content::Position.new(composition, "1:1"),
+      HeadMusic::Content::Position.new(composition, "2:1"),
+      fitness: 0
+    )
+  end
+
+  def deficiency_mark
+    return unless notes.length < minimum
+
+    HeadMusic::Style::Mark.for_all(placements, fitness: notes.length.to_f / minimum)
+  end
+end

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

@@ -4,8 +4,5 @@ module HeadMusic::Style::Guidelines; end
 # A counterpoint guideline
 class HeadMusic::Style::Guidelines::ModerateDirectionChanges < HeadMusic::Style::Guidelines::DirectionChanges
   MESSAGE = "Change melodic direction occasionally."
-
-  def self.maximum_notes_per_direction
-    5
-  end
+  MAXIMUM_NOTES_PER_DIRECTION = 5
 end

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

@@ -1,7 +1,8 @@
 # Module for style guidelines.
 module HeadMusic::Style::Guidelines; end
 
-# A counterpoint guideline
+# A counterpoint guideline. Configurable via the `minimum_conjunct_portion:`
+# option (the minimum fraction of melodic motion that must be stepwise).
 class HeadMusic::Style::Guidelines::MostlyConjunct < HeadMusic::Style::Annotation
   MESSAGE = "Use mostly conjunct motion."
 
@@ -10,11 +11,15 @@ class HeadMusic::Style::Guidelines::MostlyConjunct < HeadMusic::Style::Annotatio
   # Fux is 5/13 for lydian cantus firmus
 
   def marks
-    marks_for_skips_and_leaps if conjunct_ratio < MINIMUM_CONJUNCT_PORTION
+    marks_for_skips_and_leaps if conjunct_ratio < minimum_conjunct_portion
   end
 
   private
 
+  def minimum_conjunct_portion
+    options.fetch(:minimum_conjunct_portion) { self.class::MINIMUM_CONJUNCT_PORTION }
+  end
+
   def marks_for_skips_and_leaps
     melodic_note_pairs
       .reject(&:step?)

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

@@ -1,7 +1,9 @@
 # Module for style guidelines.
 module HeadMusic::Style::Guidelines; end
 
-# Base class for guidelines that check note counts in middle bars (not first or last).
+# Checks that each middle bar (not first or last) contains an exact number of
+# notes of a given rhythmic value. Configurable via the `count:` and
+# `rhythmic_value:` options; subclasses may set COUNT and RHYTHMIC_VALUE defaults.
 class HeadMusic::Style::Guidelines::NoteCountPerBar < HeadMusic::Style::Annotation
   def marks
     return [] unless cantus_firmus&.notes&.any?
@@ -9,8 +11,31 @@ class HeadMusic::Style::Guidelines::NoteCountPerBar < HeadMusic::Style::Annotati
     middle_bars.filter_map { |bar_number| check_middle_bar(bar_number) }
   end
 
+  def message
+    "Use #{count.humanize} #{rhythmic_unit} #{(count == 1) ? "note" : "notes"} in each middle bar."
+  end
+
   private
 
+  def count
+    options.fetch(:count) { self.class::COUNT }
+  end
+
+  def rhythmic_unit
+    options.fetch(:rhythmic_value) { self.class::RHYTHMIC_VALUE }
+  end
+
+  def rhythmic_value
+    @rhythmic_value ||= HeadMusic::Rudiment::RhythmicValue.get(rhythmic_unit)
+  end
+
+  def check_middle_bar(bar_number)
+    bar_notes = notes_in_bar(bar_number)
+    return if bar_notes.length == count && bar_notes.all? { |note| note.rhythmic_value == rhythmic_value }
+
+    mark_bar(bar_number)
+  end
+
   def middle_bars
     cf_notes = cantus_firmus.notes
     return [] if cf_notes.length <= 2

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

@@ -3,16 +3,6 @@ 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
+  COUNT = 1
+  RHYTHMIC_VALUE = :whole
 end

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

@@ -25,9 +25,13 @@ class HeadMusic::Style::Guidelines::SecondSpeciesBreak < HeadMusic::Style::Guide
       .map { |note| HeadMusic::Style::Mark.for(note) }
   end
 
+  def max_break_ratio
+    options.fetch(:max_break_ratio) { self.class::MAX_BREAK_RATIO }
+  end
+
   def frequency_marks
     return [] if total_bars <= 0
-    return [] if break_bars.length <= total_bars * MAX_BREAK_RATIO
+    return [] if break_bars.length <= total_bars * max_break_ratio
 
     break_bar_notes = break_bars.flat_map { |bar| notes_in_bar(bar) }
     [HeadMusic::Style::Mark.for_all(break_bar_notes, fitness: HeadMusic::SMALL_PENALTY_FACTOR)]

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

@@ -2,19 +2,35 @@
 module HeadMusic::Style::Guidelines; end
 
 # A voice shouldn't expend the range of a 10th.
+# Configurable via the `maximum_range:` option (a diatonic interval number).
 class HeadMusic::Style::Guidelines::SingableRange < HeadMusic::Style::Annotation
   MAXIMUM_RANGE = 10
 
-  MESSAGE = "Limit melodic range to a 10th."
+  # Ordinals whose spoken form begins with a vowel sound take "an" instead of
+  # "a" (an eighth, an eleventh, an eighteenth). Others in the singable range
+  # take "a".
+  VOWEL_SOUND_ORDINALS = [8, 11, 18].freeze
 
   def marks
     HeadMusic::Style::Mark.for_each(extremes, fitness: HeadMusic::PENALTY_FACTOR**overage) if overage.positive?
   end
 
+  def message
+    "Limit melodic range to #{indefinite_article} #{maximum_range.ordinalize}."
+  end
+
   private
 
+  def maximum_range
+    options.fetch(:maximum_range) { self.class::MAXIMUM_RANGE }
+  end
+
+  def indefinite_article
+    VOWEL_SOUND_ORDINALS.include?(maximum_range) ? "an" : "a"
+  end
+
   def overage
-    notes.any? ? [range.number - MAXIMUM_RANGE, 0].max : 0
+    notes.any? ? [range.number - maximum_range, 0].max : 0
   end
 
   def extremes

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

@@ -3,16 +3,6 @@ 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
+  COUNT = 3
+  RHYTHMIC_VALUE = :quarter
 end

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

@@ -3,16 +3,6 @@ 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
+  COUNT = 2
+  RHYTHMIC_VALUE = :half
 end

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

@@ -1,19 +1,7 @@
 # Module for style guidelines.
 module HeadMusic::Style::Guidelines; end
 
-# A counterpoint guideline
-class HeadMusic::Style::Guidelines::UpToFourteenNotes < HeadMusic::Style::Annotation
+# A counterpoint guideline: the cantus firmus should have at most fourteen notes.
+class HeadMusic::Style::Guidelines::UpToFourteenNotes < HeadMusic::Style::Guidelines::MaximumNotes
   MAXIMUM_NOTES = 14
-
-  MESSAGE = "Write up to fourteen notes."
-
-  def marks
-    HeadMusic::Style::Mark.for_each(notes[MAXIMUM_NOTES..]) if overage.positive?
-  end
-
-  private
-
-  def overage
-    [notes.length - MAXIMUM_NOTES, 0].max
-  end
 end

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

@@ -0,0 +1,10 @@
+# Module for guides
+module HeadMusic::Style::Guides; end
+
+# Base class for style guides. A guide analyzes a voice against its RULESET,
+# producing one annotation per rule.
+class HeadMusic::Style::Guides::Base
+  def self.analyze(voice)
+    self::RULESET.map { |rule| rule.new(voice) }
+  end
+end

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

@@ -4,13 +4,7 @@ module HeadMusic::Style::Guides; end
 # Rules for combined first, second, and third species harmony
 class HeadMusic::Style::Guides::CombinedFirstSecondThirdSpeciesHarmony < HeadMusic::Style::Guides::SpeciesHarmony
   RULESET = [
-    HeadMusic::Style::Guidelines::ApproachPerfectionContrarily,
-    HeadMusic::Style::Guidelines::AvoidCrossingVoices,
-    HeadMusic::Style::Guidelines::AvoidOverlappingVoices,
-    HeadMusic::Style::Guidelines::ConsonantDownbeats,
-    HeadMusic::Style::Guidelines::NoParallelPerfectOnDownbeats,
-    HeadMusic::Style::Guidelines::PreferContraryMotion,
-    HeadMusic::Style::Guidelines::PreferImperfect,
+    *HARMONIC_CORE,
     HeadMusic::Style::Guidelines::FloridDissonanceTreatment
   ].freeze
 end

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

@@ -4,19 +4,14 @@ module HeadMusic::Style::Guides; end
 # Rules for combined first, second, and third species melodies
 class HeadMusic::Style::Guides::CombinedFirstSecondThirdSpeciesMelody < HeadMusic::Style::Guides::SpeciesMelody
   RULESET = [
+    *MELODIC_CORE,
+    HeadMusic::Style::Guidelines::AllowedRhythmicValuesForCombined123,
     HeadMusic::Style::Guidelines::AlwaysMove,
-    HeadMusic::Style::Guidelines::ConsonantClimax,
-    HeadMusic::Style::Guidelines::Diatonic,
     HeadMusic::Style::Guidelines::EndOnTonic,
     HeadMusic::Style::Guidelines::FrequentDirectionChanges,
-    HeadMusic::Style::Guidelines::LimitOctaveLeaps,
-    HeadMusic::Style::Guidelines::MostlyConjunct,
+    HeadMusic::Style::Guidelines::NoRestsAfterNote,
     HeadMusic::Style::Guidelines::PrepareOctaveLeaps,
-    HeadMusic::Style::Guidelines::SingableIntervals,
-    HeadMusic::Style::Guidelines::SingableRange,
     HeadMusic::Style::Guidelines::StartOnPerfectConsonance,
-    HeadMusic::Style::Guidelines::StepUpToFinalNote,
-    HeadMusic::Style::Guidelines::AllowedRhythmicValuesForCombined123,
-    HeadMusic::Style::Guidelines::NoRestsAfterNote
+    HeadMusic::Style::Guidelines::StepUpToFinalNote
   ].freeze
 end

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

@@ -0,0 +1,11 @@
+# Guidelines for a free diatonic melody (not bound to cantus firmus start/end constraints).
+class HeadMusic::Style::Guides::DiatonicMelody < HeadMusic::Style::Guides::SpeciesMelody
+  RULESET = [
+    *MELODIC_CORE,
+    HeadMusic::Style::Guidelines::ModerateDirectionChanges,
+    HeadMusic::Style::Guidelines::PrepareOctaveLeaps,
+    HeadMusic::Style::Guidelines::SingleLargeLeaps,
+    HeadMusic::Style::Guidelines::MinimumNotes.with(minimum: 5),
+    HeadMusic::Style::Guidelines::MaximumNotes.with(maximum: 24)
+  ].freeze
+end

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

@@ -4,17 +4,11 @@ module HeadMusic::Style::Guides; end
 # Rules for fifth species (florid) harmony
 class HeadMusic::Style::Guides::FifthSpeciesHarmony < HeadMusic::Style::Guides::SpeciesHarmony
   RULESET = [
-    HeadMusic::Style::Guidelines::ApproachPerfectionContrarily,
-    HeadMusic::Style::Guidelines::AvoidCrossingVoices,
-    HeadMusic::Style::Guidelines::AvoidOverlappingVoices,
-    HeadMusic::Style::Guidelines::ConsonantDownbeats,
+    *HARMONIC_CORE,
+    HeadMusic::Style::Guidelines::FloridDissonanceTreatment,
     HeadMusic::Style::Guidelines::NoParallelPerfectAcrossBarline,
-    HeadMusic::Style::Guidelines::NoParallelPerfectOnDownbeats,
     HeadMusic::Style::Guidelines::NoParallelPerfectWithSyncopation,
     HeadMusic::Style::Guidelines::NoStrongBeatUnisons,
-    HeadMusic::Style::Guidelines::PreferContraryMotion,
-    HeadMusic::Style::Guidelines::PreferImperfect,
-    HeadMusic::Style::Guidelines::FloridDissonanceTreatment,
     HeadMusic::Style::Guidelines::SuspensionTreatment
   ].freeze
 end

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

@@ -4,22 +4,17 @@ module HeadMusic::Style::Guides; end
 # Rules for fifth species (florid) melodies
 class HeadMusic::Style::Guides::FifthSpeciesMelody < HeadMusic::Style::Guides::SpeciesMelody
   RULESET = [
+    *MELODIC_CORE,
+    HeadMusic::Style::Guidelines::AllowedRhythmicValuesForFifthSpecies,
     HeadMusic::Style::Guidelines::AlwaysMove,
-    HeadMusic::Style::Guidelines::ConsonantClimax,
-    HeadMusic::Style::Guidelines::Diatonic,
     HeadMusic::Style::Guidelines::EndOnTonic,
     HeadMusic::Style::Guidelines::FrequentDirectionChanges,
-    HeadMusic::Style::Guidelines::LimitOctaveLeaps,
-    HeadMusic::Style::Guidelines::MostlyConjunct,
+    HeadMusic::Style::Guidelines::MixedRhythmicValues,
+    HeadMusic::Style::Guidelines::NoRestsAfterNote,
     HeadMusic::Style::Guidelines::NoteFillsFinalBar,
     HeadMusic::Style::Guidelines::PrepareOctaveLeaps,
-    HeadMusic::Style::Guidelines::SingableIntervals,
-    HeadMusic::Style::Guidelines::SingableRange,
     HeadMusic::Style::Guidelines::StartOnPerfectConsonance,
     HeadMusic::Style::Guidelines::StepOutOfUnison,
-    HeadMusic::Style::Guidelines::StepUpToFinalNote,
-    HeadMusic::Style::Guidelines::AllowedRhythmicValuesForFifthSpecies,
-    HeadMusic::Style::Guidelines::MixedRhythmicValues,
-    HeadMusic::Style::Guidelines::NoRestsAfterNote
+    HeadMusic::Style::Guidelines::StepUpToFinalNote
   ].freeze
 end

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

@@ -1,15 +1,9 @@
 # Rules for first species harmony
 class HeadMusic::Style::Guides::FirstSpeciesHarmony < HeadMusic::Style::Guides::SpeciesHarmony
   RULESET = [
-    HeadMusic::Style::Guidelines::ApproachPerfectionContrarily,
-    HeadMusic::Style::Guidelines::AvoidCrossingVoices,
-    HeadMusic::Style::Guidelines::AvoidOverlappingVoices,
-    HeadMusic::Style::Guidelines::ConsonantDownbeats,
-    HeadMusic::Style::Guidelines::NoParallelPerfectOnDownbeats,
+    *HARMONIC_CORE,
     HeadMusic::Style::Guidelines::NoUnisonsInMiddle,
-    HeadMusic::Style::Guidelines::OneToOne,
-    HeadMusic::Style::Guidelines::PreferContraryMotion,
-    HeadMusic::Style::Guidelines::PreferImperfect
+    HeadMusic::Style::Guidelines::OneToOne
   ].freeze
 end
 

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

@@ -4,18 +4,13 @@ module HeadMusic::Style::Guides; end
 # Rules for first species melodies
 class HeadMusic::Style::Guides::FirstSpeciesMelody < HeadMusic::Style::Guides::SpeciesMelody
   RULESET = [
-    HeadMusic::Style::Guidelines::ConsonantClimax,
-    HeadMusic::Style::Guidelines::Diatonic,
+    *MELODIC_CORE,
     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::NoteFillsFinalBar,
     HeadMusic::Style::Guidelines::OnePerBar,
     HeadMusic::Style::Guidelines::PrepareOctaveLeaps,
-    HeadMusic::Style::Guidelines::SingableIntervals,
-    HeadMusic::Style::Guidelines::SingableRange,
     HeadMusic::Style::Guidelines::StartOnPerfectConsonance,
     HeadMusic::Style::Guidelines::StepOutOfUnison,
     HeadMusic::Style::Guidelines::StepUpToFinalNote

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

@@ -1,15 +1,9 @@
 # Rules for fourth species harmony
 class HeadMusic::Style::Guides::FourthSpeciesHarmony < HeadMusic::Style::Guides::SpeciesHarmony
   RULESET = [
-    HeadMusic::Style::Guidelines::ApproachPerfectionContrarily,
-    HeadMusic::Style::Guidelines::AvoidCrossingVoices,
-    HeadMusic::Style::Guidelines::AvoidOverlappingVoices,
-    HeadMusic::Style::Guidelines::ConsonantDownbeats,
-    HeadMusic::Style::Guidelines::NoParallelPerfectOnDownbeats,
+    *HARMONIC_CORE,
     HeadMusic::Style::Guidelines::NoParallelPerfectWithSyncopation,
     HeadMusic::Style::Guidelines::NoStrongBeatUnisons,
-    HeadMusic::Style::Guidelines::PreferContraryMotion,
-    HeadMusic::Style::Guidelines::PreferImperfect,
     HeadMusic::Style::Guidelines::SecondSpeciesBreak,
     HeadMusic::Style::Guidelines::SuspensionTreatment
   ].freeze

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

@@ -4,21 +4,16 @@ module HeadMusic::Style::Guides; end
 # Rules for fourth species melodies
 class HeadMusic::Style::Guides::FourthSpeciesMelody < HeadMusic::Style::Guides::SpeciesMelody
   RULESET = [
+    *MELODIC_CORE,
     HeadMusic::Style::Guidelines::AlwaysMove,
-    HeadMusic::Style::Guidelines::ConsonantClimax,
-    HeadMusic::Style::Guidelines::Diatonic,
     HeadMusic::Style::Guidelines::EndOnTonic,
-    HeadMusic::Style::Guidelines::NoteFillsFinalBar,
     HeadMusic::Style::Guidelines::FrequentDirectionChanges,
-    HeadMusic::Style::Guidelines::LimitOctaveLeaps,
-    HeadMusic::Style::Guidelines::MostlyConjunct,
+    HeadMusic::Style::Guidelines::NoRestsAfterNote,
+    HeadMusic::Style::Guidelines::NoteFillsFinalBar,
     HeadMusic::Style::Guidelines::OneToOneWithTies,
     HeadMusic::Style::Guidelines::PrepareOctaveLeaps,
-    HeadMusic::Style::Guidelines::SingableIntervals,
-    HeadMusic::Style::Guidelines::SingableRange,
     HeadMusic::Style::Guidelines::StartOnPerfectConsonance,
     HeadMusic::Style::Guidelines::StepOutOfUnison,
-    HeadMusic::Style::Guidelines::StepUpToFinalNote,
-    HeadMusic::Style::Guidelines::NoRestsAfterNote
+    HeadMusic::Style::Guidelines::StepUpToFinalNote
   ].freeze
 end

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

@@ -4,19 +4,14 @@ module HeadMusic::Style::Guides; end
 # Rules for the cantus firmus according to Fux.
 class HeadMusic::Style::Guides::FuxCantusFirmus < HeadMusic::Style::Guides::SpeciesMelody
   RULESET = [
+    *MELODIC_CORE,
     HeadMusic::Style::Guidelines::AlwaysMove,
     HeadMusic::Style::Guidelines::AtLeastEightNotes,
-    HeadMusic::Style::Guidelines::ConsonantClimax,
-    HeadMusic::Style::Guidelines::Diatonic,
     HeadMusic::Style::Guidelines::EndOnTonic,
     HeadMusic::Style::Guidelines::FrequentDirectionChanges,
-    HeadMusic::Style::Guidelines::LimitOctaveLeaps,
-    HeadMusic::Style::Guidelines::MostlyConjunct,
     HeadMusic::Style::Guidelines::NoRests,
     HeadMusic::Style::Guidelines::NotesSameLength,
     HeadMusic::Style::Guidelines::RecoverLargeLeaps,
-    HeadMusic::Style::Guidelines::SingableIntervals,
-    HeadMusic::Style::Guidelines::SingableRange,
     HeadMusic::Style::Guidelines::StartOnTonic,
     HeadMusic::Style::Guidelines::StepDownToFinalNote,
     HeadMusic::Style::Guidelines::UpToFourteenNotes

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

@@ -4,19 +4,14 @@ module HeadMusic::Style::Guides; end
 # Modern rules for the cantus firmus
 class HeadMusic::Style::Guides::ModernCantusFirmus < HeadMusic::Style::Guides::SpeciesMelody
   RULESET = [
+    *MELODIC_CORE,
     HeadMusic::Style::Guidelines::AlwaysMove,
     HeadMusic::Style::Guidelines::AtLeastEightNotes,
-    HeadMusic::Style::Guidelines::ConsonantClimax,
-    HeadMusic::Style::Guidelines::Diatonic,
     HeadMusic::Style::Guidelines::EndOnTonic,
-    HeadMusic::Style::Guidelines::LimitOctaveLeaps,
     HeadMusic::Style::Guidelines::ModerateDirectionChanges,
-    HeadMusic::Style::Guidelines::MostlyConjunct,
     HeadMusic::Style::Guidelines::NoRests,
     HeadMusic::Style::Guidelines::NotesSameLength,
     HeadMusic::Style::Guidelines::PrepareOctaveLeaps,
-    HeadMusic::Style::Guidelines::SingableIntervals,
-    HeadMusic::Style::Guidelines::SingableRange,
     HeadMusic::Style::Guidelines::SingleLargeLeaps,
     HeadMusic::Style::Guidelines::StartOnTonic,
     HeadMusic::Style::Guidelines::StepToFinalNote,

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

@@ -1,15 +1,9 @@
 # Rules for second species harmony
 class HeadMusic::Style::Guides::SecondSpeciesHarmony < HeadMusic::Style::Guides::SpeciesHarmony
   RULESET = [
-    HeadMusic::Style::Guidelines::ApproachPerfectionContrarily,
-    HeadMusic::Style::Guidelines::AvoidCrossingVoices,
-    HeadMusic::Style::Guidelines::AvoidOverlappingVoices,
-    HeadMusic::Style::Guidelines::ConsonantDownbeats,
+    *HARMONIC_CORE,
     HeadMusic::Style::Guidelines::NoParallelPerfectAcrossBarline,
-    HeadMusic::Style::Guidelines::NoParallelPerfectOnDownbeats,
     HeadMusic::Style::Guidelines::NoStrongBeatUnisons,
-    HeadMusic::Style::Guidelines::PreferContraryMotion,
-    HeadMusic::Style::Guidelines::PreferImperfect,
     HeadMusic::Style::Guidelines::WeakBeatDissonanceTreatment
   ].freeze
 end

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

@@ -4,22 +4,17 @@ module HeadMusic::Style::Guides; end
 # Rules for second species melodies
 class HeadMusic::Style::Guides::SecondSpeciesMelody < HeadMusic::Style::Guides::SpeciesMelody
   RULESET = [
+    *MELODIC_CORE,
     HeadMusic::Style::Guidelines::AlwaysMove,
-    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,
+    HeadMusic::Style::Guidelines::NoRestsAfterNote,
+    HeadMusic::Style::Guidelines::NoteFillsFinalBar,
     HeadMusic::Style::Guidelines::PrepareOctaveLeaps,
-    HeadMusic::Style::Guidelines::SingableIntervals,
-    HeadMusic::Style::Guidelines::SingableRange,
     HeadMusic::Style::Guidelines::StartOnPerfectConsonance,
     HeadMusic::Style::Guidelines::StepOutOfUnison,
     HeadMusic::Style::Guidelines::StepUpToFinalNote,
-    HeadMusic::Style::Guidelines::TwoPerBar,
-    HeadMusic::Style::Guidelines::NoRestsAfterNote
+    HeadMusic::Style::Guidelines::TwoPerBar
   ].freeze
 end

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

@@ -1,9 +1,18 @@
 # Module for guides
 module HeadMusic::Style::Guides; end
 
-# Base class for species harmony guides providing shared analysis behavior
-class HeadMusic::Style::Guides::SpeciesHarmony
-  def self.analyze(voice)
-    self::RULESET.map { |rule| rule.new(voice) }
-  end
+# Base class for species harmony guides. Inherits analysis behavior from Base;
+# exists as a semantic marker distinguishing harmony guides from melody guides.
+class HeadMusic::Style::Guides::SpeciesHarmony < HeadMusic::Style::Guides::Base
+  # Guidelines shared by every harmonic guide. Subclasses splat this into their
+  # RULESET: RULESET = [*HARMONIC_CORE, ...species-specific rules].
+  HARMONIC_CORE = [
+    HeadMusic::Style::Guidelines::ApproachPerfectionContrarily,
+    HeadMusic::Style::Guidelines::AvoidCrossingVoices,
+    HeadMusic::Style::Guidelines::AvoidOverlappingVoices,
+    HeadMusic::Style::Guidelines::ConsonantDownbeats,
+    HeadMusic::Style::Guidelines::NoParallelPerfectOnDownbeats,
+    HeadMusic::Style::Guidelines::PreferContraryMotion,
+    HeadMusic::Style::Guidelines::PreferImperfect
+  ].freeze
 end

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

@@ -1,9 +1,17 @@
 # Module for guides
 module HeadMusic::Style::Guides; end
 
-# Base class for species melody guides providing shared analysis behavior
-class HeadMusic::Style::Guides::SpeciesMelody
-  def self.analyze(voice)
-    self::RULESET.map { |rule| rule.new(voice) }
-  end
+# Base class for species melody guides. Inherits analysis behavior from Base;
+# exists as a semantic marker distinguishing melody guides from harmony guides.
+class HeadMusic::Style::Guides::SpeciesMelody < HeadMusic::Style::Guides::Base
+  # Guidelines shared by every melodic guide. Subclasses splat this into their
+  # RULESET: RULESET = [*MELODIC_CORE, ...species-specific rules].
+  MELODIC_CORE = [
+    HeadMusic::Style::Guidelines::ConsonantClimax,
+    HeadMusic::Style::Guidelines::Diatonic,
+    HeadMusic::Style::Guidelines::LimitOctaveLeaps,
+    HeadMusic::Style::Guidelines::MostlyConjunct,
+    HeadMusic::Style::Guidelines::SingableIntervals,
+    HeadMusic::Style::Guidelines::SingableRange
+  ].freeze
 end

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

@@ -1,15 +1,9 @@
 # Rules for third species harmony
 class HeadMusic::Style::Guides::ThirdSpeciesHarmony < HeadMusic::Style::Guides::SpeciesHarmony
   RULESET = [
-    HeadMusic::Style::Guidelines::ApproachPerfectionContrarily,
-    HeadMusic::Style::Guidelines::AvoidCrossingVoices,
-    HeadMusic::Style::Guidelines::AvoidOverlappingVoices,
-    HeadMusic::Style::Guidelines::ConsonantDownbeats,
+    *HARMONIC_CORE,
     HeadMusic::Style::Guidelines::NoParallelPerfectAcrossBarline,
-    HeadMusic::Style::Guidelines::NoParallelPerfectOnDownbeats,
     HeadMusic::Style::Guidelines::NoStrongBeatUnisons,
-    HeadMusic::Style::Guidelines::PreferContraryMotion,
-    HeadMusic::Style::Guidelines::PreferImperfect,
     HeadMusic::Style::Guidelines::ThirdSpeciesDissonanceTreatment
   ].freeze
 end

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

@@ -4,22 +4,17 @@ module HeadMusic::Style::Guides; end
 # Rules for third species melodies
 class HeadMusic::Style::Guides::ThirdSpeciesMelody < HeadMusic::Style::Guides::SpeciesMelody
   RULESET = [
+    *MELODIC_CORE,
     HeadMusic::Style::Guidelines::AlwaysMove,
-    HeadMusic::Style::Guidelines::ConsonantClimax,
-    HeadMusic::Style::Guidelines::Diatonic,
     HeadMusic::Style::Guidelines::EndOnTonic,
-    HeadMusic::Style::Guidelines::NoteFillsFinalBar,
     HeadMusic::Style::Guidelines::FirstBarQuarterNotes,
     HeadMusic::Style::Guidelines::FourPerBar,
     HeadMusic::Style::Guidelines::FrequentDirectionChanges,
-    HeadMusic::Style::Guidelines::LimitOctaveLeaps,
-    HeadMusic::Style::Guidelines::MostlyConjunct,
+    HeadMusic::Style::Guidelines::NoRestsAfterNote,
+    HeadMusic::Style::Guidelines::NoteFillsFinalBar,
     HeadMusic::Style::Guidelines::PrepareOctaveLeaps,
-    HeadMusic::Style::Guidelines::SingableIntervals,
-    HeadMusic::Style::Guidelines::SingableRange,
     HeadMusic::Style::Guidelines::StartOnPerfectConsonance,
     HeadMusic::Style::Guidelines::StepOutOfUnison,
-    HeadMusic::Style::Guidelines::StepUpToFinalNote,
-    HeadMusic::Style::Guidelines::NoRestsAfterNote
+    HeadMusic::Style::Guidelines::StepUpToFinalNote
   ].freeze
 end

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

@@ -1,15 +1,9 @@
 # Rules for triple meter harmony
 class HeadMusic::Style::Guides::ThirdSpeciesTripleMeterHarmony < HeadMusic::Style::Guides::SpeciesHarmony
   RULESET = [
-    HeadMusic::Style::Guidelines::ApproachPerfectionContrarily,
-    HeadMusic::Style::Guidelines::AvoidCrossingVoices,
-    HeadMusic::Style::Guidelines::AvoidOverlappingVoices,
-    HeadMusic::Style::Guidelines::ConsonantDownbeats,
+    *HARMONIC_CORE,
     HeadMusic::Style::Guidelines::NoParallelPerfectAcrossBarline,
-    HeadMusic::Style::Guidelines::NoParallelPerfectOnDownbeats,
     HeadMusic::Style::Guidelines::NoStrongBeatUnisons,
-    HeadMusic::Style::Guidelines::PreferContraryMotion,
-    HeadMusic::Style::Guidelines::PreferImperfect,
     HeadMusic::Style::Guidelines::TripleMeterDissonanceTreatment
   ].freeze
 end

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

@@ -4,22 +4,17 @@ module HeadMusic::Style::Guides; end
 # Rules for triple meter melodies
 class HeadMusic::Style::Guides::ThirdSpeciesTripleMeterMelody < HeadMusic::Style::Guides::SpeciesMelody
   RULESET = [
+    *MELODIC_CORE,
     HeadMusic::Style::Guidelines::AlwaysMove,
-    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,
+    HeadMusic::Style::Guidelines::NoRestsAfterNote,
+    HeadMusic::Style::Guidelines::NoteFillsFinalBar,
     HeadMusic::Style::Guidelines::PrepareOctaveLeaps,
-    HeadMusic::Style::Guidelines::SingableIntervals,
-    HeadMusic::Style::Guidelines::SingableRange,
     HeadMusic::Style::Guidelines::StartOnPerfectConsonance,
     HeadMusic::Style::Guidelines::StepOutOfUnison,
     HeadMusic::Style::Guidelines::StepUpToFinalNote,
-    HeadMusic::Style::Guidelines::ThreePerBar,
-    HeadMusic::Style::Guidelines::NoRestsAfterNote
+    HeadMusic::Style::Guidelines::ThreePerBar
   ].freeze
 end

data/lib/head_music/version.rb

@@ -1,3 +1,3 @@
 module HeadMusic
-  VERSION = "12.5.0"
+  VERSION = "12.6.0"
 end

data/lib/head_music.rb

@@ -9,6 +9,7 @@ require "head_music/version"
 
 require "active_support/core_ext/module/delegation"
 require "active_support/core_ext/string/access"
+require "active_support/core_ext/integer/inflections"
 require "humanize"
 require "i18n"
 require "i18n/backend/fallbacks"
@@ -152,6 +153,7 @@ require "head_music/style/mark"
 # style guidelines
 require "head_music/style/guidelines/always_move"
 require "head_music/style/guidelines/approach_perfection_contrarily"
+require "head_music/style/guidelines/minimum_notes"
 require "head_music/style/guidelines/at_least_eight_notes"
 require "head_music/style/guidelines/avoid_crossing_voices"
 require "head_music/style/guidelines/avoid_overlapping_voices"
@@ -200,6 +202,7 @@ require "head_music/style/guidelines/step_up_to_final_note"
 require "head_music/style/guidelines/suspension_treatment"
 require "head_music/style/guidelines/three_per_bar"
 require "head_music/style/guidelines/two_per_bar"
+require "head_music/style/guidelines/maximum_notes"
 require "head_music/style/guidelines/up_to_fourteen_notes"
 require "head_music/style/guidelines/weak_beat_dissonance_treatment"
 require "head_music/style/guidelines/dissonance_figure_detection"
@@ -212,10 +215,12 @@ require "head_music/style/guidelines/florid_dissonance_treatment"
 require "head_music/style/guidelines/mixed_rhythmic_values"
 
 # style guides
+require "head_music/style/guides/base"
 require "head_music/style/guides/species_melody"
 require "head_music/style/guides/fux_cantus_firmus"
 require "head_music/style/guides/modern_cantus_firmus"
 require "head_music/style/guides/first_species_melody"
+require "head_music/style/guides/diatonic_melody"
 require "head_music/style/guides/species_harmony"
 require "head_music/style/guides/first_species_harmony"
 require "head_music/style/guides/second_species_melody"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: head_music
 version: !ruby/object:Gem::Version
-  version: 12.5.0
+  version: 12.6.0
 platform: ruby
 authors:
 - Rob Head
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-04-08 00:00:00.000000000 Z
+date: 2026-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -291,6 +291,8 @@ files:
 - 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/maximum_notes.rb
+- lib/head_music/style/guidelines/minimum_notes.rb
 - lib/head_music/style/guidelines/mixed_rhythmic_values.rb
 - lib/head_music/style/guidelines/moderate_direction_changes.rb
 - lib/head_music/style/guidelines/mostly_conjunct.rb
@@ -328,8 +330,10 @@ files:
 - 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/base.rb
 - lib/head_music/style/guides/combined_first_second_third_species_harmony.rb
 - lib/head_music/style/guides/combined_first_second_third_species_melody.rb
+- lib/head_music/style/guides/diatonic_melody.rb
 - lib/head_music/style/guides/fifth_species_harmony.rb
 - lib/head_music/style/guides/fifth_species_melody.rb
 - lib/head_music/style/guides/first_species_harmony.rb
@@ -417,7 +421,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: The rudiments of western music theory and analysis.