head_music 12.4.0 → 12.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc52f4684dac9eebefdc696f1d7f74094c98b26994905f7436cd757800880764
-  data.tar.gz: 3087c3c68254f16768f875538d54028db26498b8f7dfb8e543e7d402582a4581
+  metadata.gz: 4a02a5ef281eecc76bcf953aa51c04078858b4588f2b85c0b1a4d1f4d88464d6
+  data.tar.gz: 5a31a94133ffbb97944524d75aedcbbfcbf7ce769fe6049559818a1940438442
 SHA512:
-  metadata.gz: 6344e623f21eaad3c5c1dab093980062701d33ebca7f73050e211a7665afc2f81e49ef0de69e99f6a5c14d0d7797608cf35a88ca2c54c94590bbf404e575db9f
-  data.tar.gz: d28d37afdaae4bb89cbe3de6e1b9957fc5d19d3e54a03f1d9145092e7e7727545751365bad050b96a2f26a5b8f56972ebcbd99f9ad985c11a27e6e95636c174b
+  metadata.gz: 369c959ae6f69cd609a65e4dee6b4aace0283d107132fec61f3b35afadfeb27d5386c60e969d88cfe626bdc0873e3c5dbed736513d93523e68c5dfca4127b6f1
+  data.tar.gz: 0f04cf766ce824188270ad00fe29866f652befcb0ff0d5c3eeaadd21e286b088bfb8883fe8687f94c0eaf2e216c5a2ee0377afc91756df18e9e587b5fef0eb41

data/CLAUDE.md

@@ -93,17 +93,33 @@ The codebase follows a domain-driven design with clear module boundaries:
 4. **HeadMusic::Content** - Musical composition representation
   - Compositions, voices, bars, positions
   - Notes in context (pitch + duration + placement)
-  - Temporal organization
-
-5. **HeadMusic::Analysis** - Musical analysis tools
-  - Intervals, chords, motion analysis
-  - Harmonic and melodic analysis
+  - Uses HeadMusic::Time for temporal positioning
+
+5. **HeadMusic::Time** - Temporal infrastructure
+  - Clock positions (elapsed nanoseconds as source of truth)
+  - Musical positions (bars:beats:ticks:subticks notation)
+  - SMPTE timecode (hours:minutes:seconds:frames for video/audio sync)
+  - Conductor: converts between clock time and musical position
+  - Tempo and meter maps for tracking changes over time
+
+6. **HeadMusic::Analysis** - Musical analysis tools
+  - Diatonic intervals (quality + size)
+  - Harmonic and melodic interval analysis
+  - Consonance classification
+  - Motion analysis (parallel, similar, contrary, oblique)
   - Pitch class sets and collections
+  - Sonority and dyad analysis
+  - Circle (of fifths) and interval cycles
 
-6. **HeadMusic::Style** - Composition rules and guidelines
-  - Counterpoint rules
+7. **HeadMusic::Style** - Composition rules and guidelines
+  - Counterpoint rules (species counterpoint guides)
   - Voice leading guidelines
-  - Style analysis
+  - Style analysis and annotations
+  - Historical traditions (medieval, renaissance, modern)
+
+8. **HeadMusic::Utilities** - Shared helpers
+  - Case conversion
+  - Hash key utilities
 
 ### Key Design Patterns
 
@@ -171,7 +187,7 @@ This project deliberately deprioritizes formal documentation in favor of clear,
 Domain reference materials live in `references/`.
 Consult these when implementing or modifying style guidelines:
 
-- `references/second-species-counterpoint.md` — Pedagogical survey of second-species counterpoint rules from Fux through contemporary sources, with cross-source comparison and mapping to head_music's style guideline architecture.
+Consult the files in `references/` when implementing or modifying style guidelines. These contain pedagogical surveys with cross-source comparisons mapped to head_music's style guideline architecture.
 
 ## Music theory and concepts
 

data/Gemfile.lock

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

data/MUSIC_THEORY.md

@@ -8,7 +8,7 @@ The rudiments of music theory are built up piece-by-piece.
 letter name
   - C, D, E, F, G, A, B, …
   - equivalent to:
-   - do, re, mi, fa, sol, la, si/ti, …
+    - do, re, mi, fa, sol, la, si/ti, …
 
 alteration
   - sharp, flat, double sharp, double flat
@@ -44,7 +44,7 @@ rhythmic value (duration)
   - augmentation dots extend the duration of the rhythmic unit
     - one dot extends the rhythmic value 50%
     - two dots extend the rhythmic value 75%
-    - two dots extend the rhythmic value 87.5%
+    - three dots extend the rhythmic value 87.5%
 
 rest
   - a rhythmic value that passes in silence
@@ -64,9 +64,9 @@ tied duration
 articulation
   - a category of expressions that modify how one or more notes are performed.
   - level of connection
-    - staccatissimo - the most staccato, even shorted and more clipped
-    - staccato – detatched (shortened to lease space between adjacent notes)
-    - tenuto - held of the full value
+    - staccatissimo - the most staccato, even shorter and more clipped
+    - staccato – detached (shortened to leave space between adjacent notes)
+    - tenuto - held for the full value
     - legato - smoothly connected
   - emphasis
     - accent - play with emphasis or a stronger attack
@@ -76,45 +76,108 @@ articulation
     - breath mark
     - roll mark
 
-## Instrument Families
+## Intervals
+
+interval
+  - the distance between two pitches
+  - described by quality + size
+  - size: unison, second, third, fourth, fifth, sixth, seventh, octave, etc.
+  - quality: perfect, major, minor, augmented, diminished
+  - perfect intervals: unison, fourth, fifth, octave
+  - major/minor intervals: second, third, sixth, seventh
+  - a chromatic interval measures distance in half steps (semitones)
+  - a diatonic interval considers the letter names and key context
+
+harmonic interval
+  - two pitches sounding simultaneously
+
+melodic interval
+  - two pitches sounding in succession
+  - ascending or descending
+
+## Consonance and Dissonance
+
+consonance
+  - intervals that sound stable and resolved
+  - perfect consonances: unison, perfect fifth, octave
+  - imperfect consonances: major/minor third, major/minor sixth
+
+dissonance
+  - intervals that sound tense and seek resolution
+  - seconds, sevenths, tritone (augmented fourth / diminished fifth)
+  - perfect fourth considered "dissonance" requiring resolution in traditional counterpoint
 
-There are several ways that people talk about families and other categorizations of instruments. For example, the "string family" or "woodwind family", but also more specifically, the word family is applied more specifically (e.g. the "oboe family").
+## Scales and Modes
 
-### Text Conversation with Brian Head (May 7, 2023)
+scale
+  - an ordered collection of pitches spanning an octave
+  - defined by a pattern of whole steps and half steps
+  - named by its tonic (starting pitch) and type
 
-Brian Head, brother and faculty at USC Thornton School of Music
-https://music.usc.edu/brian-head/
+major scale
+  - pattern: W-W-H-W-W-W-H (W = whole step, H = half step)
 
-Robert Head:
-	Hey, Brian. You have a sec for a music question? I’m trying to come up with different terms for the way “family” is used. “Woodwind family” vs. “Oboe family”.
+natural minor scale
+  - pattern: W-H-W-W-H-W-W
 
-Brian Head:
-	Those are good, I’d say.  In what context?
+modes
+  - scales derived by starting on different degrees of a parent scale
+  - Ionian (= major), Dorian, Phrygian, Lydian, Mixolydian, Aeolian (= natural minor), Locrian
 
-Robert Head:
-	In my software project, I’m trying to define those relationships. One is a section of the orchestra and the other is species of instrument. But usually people, in my experience, just say “family”.
-	Is there some more precise terminology or adjective that can disambiguate those two terms?
+## Keys and Key Signatures
 
-Brian Head:
-	Hmmm. Already “family” is informal. Blatter distinguishes between “choir” and “family” as in the  trumpet family” within the “brass choir”.
+key
+  - a tonal center (tonic) combined with a scale type (major or minor)
+  - example: "E-flat major", "A minor"
 
-Robert Head:
-	Ah, yes! I do like that.
-	But does it apply to percussion?
-	“Section” is another candidate, but that gets used for string parts as well.
+key signature
+  - the set of sharps or flats applied to a key
+  - written at the beginning of each staff line
+  - determines the default alteration for each letter name
 
-Brian Head:
-	Strings and percussion probably don’t think of themselves as a choir, but if you’re mainly looking for a taxonomically consistent word, that’s the feat I can think of at the moment.
-	Section is a good word, too, which easily flows between smaller and larger meanings.
+## Chords
 
-Robert Head:
-	Obviously, the four “families” is a garbage way to classify all instruments and it really is more applicable to the orchestral context, so maybe “orchestra family” or “orchestra section”.
+chord
+  - three or more pitches sounding together
+  - built by stacking intervals (typically thirds)
 
-Brian Head:
-	I’d say that “family” is best used at the instrument level, as in “saxophone family”. Choir or section are better for larger collections. Still, both of those words connote membership in an orchestra. Or large ensemble.  “Woodwinds” or “percussion” describe the class of instruments themselves.
+triad
+  - a three-note chord: root, third, fifth
+  - types: major, minor, diminished, augmented
 
-Robert Head:
-	Cool
+seventh chord
+  - a four-note chord: root, third, fifth, seventh
+  - types: major seventh, dominant seventh, minor seventh, half-diminished, diminished
+
+inversion
+  - a reordering of chord tones so that a note other than the root is the lowest
+  - root position, first inversion, second inversion (third inversion for seventh chords)
+
+## Voice Leading and Counterpoint
+
+voice leading
+  - the way individual melodic lines (voices) move from one chord to the next
+  - smooth voice leading minimizes the distance each voice moves
+
+types of motion between two voices
+  - parallel: both voices move in the same direction by the same interval
+  - similar: both voices move in the same direction by different intervals
+  - contrary: voices move in opposite directions
+  - oblique: one voice stays on the same pitch while the other moves
+
+counterpoint
+  - the art of combining independent melodic lines
+  - species counterpoint is a pedagogical method with five species of increasing complexity
+    - first species: note against note
+    - second species: two notes against one
+    - third species: four notes against one
+    - fourth species: suspensions — notes tied across the barline create dissonances that resolve by step
+    - fifth species: florid counterpoint, combining all species
+
+## Instrument Families
 
-Action Item: Call them orchestra_section
-DONE
+instrument family
+  - instruments grouped by shared characteristics
+  - broad families: strings, woodwinds, brass, percussion, keyboards, voices
+  - specific families: e.g. the oboe family (oboe, English horn, oboe d'amore)
+  - instruments within a family share similar tone production and playing technique

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

@@ -1,12 +1,107 @@
 # Module for style guidelines.
 module HeadMusic::Style::Guidelines; end
 
-# All rhythmic values are allowed in fifth species counterpoint.
-# This guideline is always adherent.
+# Validates that counterpoint notes use only permitted rhythmic values for fifth species.
+# Whole notes (final bar only), half notes, quarter notes, and paired stepwise eighth notes
+# on weak beats are allowed. No dotted rhythms.
 class HeadMusic::Style::Guidelines::AllowedRhythmicValuesForFifthSpecies < HeadMusic::Style::Annotation
-  MESSAGE = "All rhythmic values are allowed in fifth species."
+  MESSAGE = "Use only permitted rhythmic values: whole (final bar only), half, quarter, " \
+    "or paired stepwise eighth notes on weak beats."
+
+  PERMITTED_UNIT_NAMES = %w[whole half quarter eighth].freeze
 
   def marks
-    []
+    [
+      *disallowed_unit_marks,
+      *dotted_rhythm_marks,
+      *whole_note_not_in_final_bar_marks,
+      *unpaired_eighth_note_marks,
+      *non_stepwise_eighth_note_marks,
+      *excess_eighth_note_pair_marks
+    ]
+  end
+
+  private
+
+  def disallowed_unit_marks
+    mark_each(notes.reject { |note| PERMITTED_UNIT_NAMES.include?(note.rhythmic_value.unit_name) })
+  end
+
+  def dotted_rhythm_marks
+    mark_each(notes.select { |note| note.rhythmic_value.dots > 0 })
+  end
+
+  def whole_note_not_in_final_bar_marks
+    mark_each(
+      notes
+        .select { |note| note.rhythmic_value.unit_name == "whole" }
+        .reject { |note| note.position.bar_number == final_bar_number }
+    )
+  end
+
+  def unpaired_eighth_note_marks
+    mark_each(eighth_notes.reject { |note| paired_eighth?(note) })
+  end
+
+  def non_stepwise_eighth_note_marks
+    mark_each(
+      eighth_notes
+        .select { |note| paired_eighth?(note) }
+        .reject { |note| stepwise_eighth?(note) }
+    )
+  end
+
+  def excess_eighth_note_pair_marks
+    bars_with_excess_eighth_pairs.flat_map do |bar_number|
+      mark_each(eighth_notes_in_bar(bar_number)[2..])
+    end
+  end
+
+  def mark_each(violating_notes)
+    violating_notes.map { |note| HeadMusic::Style::Mark.for(note) }
+  end
+
+  def eighth_notes
+    @eighth_notes ||= notes.select { |note| note.rhythmic_value.unit_name == "eighth" }
+  end
+
+  def paired_eighth?(note)
+    prev = preceding_note(note)
+    foll = following_note(note)
+    (prev && prev.rhythmic_value.unit_name == "eighth") ||
+      (foll && foll.rhythmic_value.unit_name == "eighth")
+  end
+
+  def stepwise_eighth?(note)
+    prev = preceding_note(note)
+    foll = following_note(note)
+    stepwise_from_prev = prev && HeadMusic::Analysis::MelodicInterval.new(prev, note).step?
+    stepwise_to_foll = foll && HeadMusic::Analysis::MelodicInterval.new(note, foll).step?
+    stepwise_from_prev || stepwise_to_foll
+  end
+
+  def bars_with_excess_eighth_pairs
+    eighth_notes
+      .group_by { |note| note.position.bar_number }
+      .select { |_bar, bar_eighths| bar_eighths.length > 2 }
+      .keys
+  end
+
+  def eighth_notes_in_bar(bar_number)
+    eighth_notes.select { |note| note.position.bar_number == bar_number }
+  end
+
+  def final_bar_number
+    last_note&.position&.bar_number
+  end
+
+  def preceding_note(note)
+    index = notes.index(note)
+    notes[index - 1] if index && index > 0
+  end
+
+  def following_note(note)
+    index = notes.index(note)
+    notes[index + 1] if index && index < notes.length - 1
   end
 end

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

@@ -1,9 +1,11 @@
 # Module for style guidelines.
 module HeadMusic::Style::Guidelines; end
 
-# A counterpoint guideline
+# A counterpoint guideline.
+# Dissonant downbeats are permitted only when the counterpoint note is a
+# properly tied-over suspension (i.e., it began before the current CF note).
 class HeadMusic::Style::Guidelines::ConsonantDownbeats < HeadMusic::Style::Annotation
-  MESSAGE = "Use consonant harmonic intervals on every downbeat."
+  MESSAGE = "Use consonant harmonic intervals on every downbeat (unless a tied suspension)."
 
   def marks
     dissonant_pairs.map do |dissonant_pair|
@@ -14,10 +16,21 @@ class HeadMusic::Style::Guidelines::ConsonantDownbeats < HeadMusic::Style::Annot
   private
 
   def dissonant_pairs
-    dissonant_intervals.map(&:notes).compact
+    non_suspension_dissonant_intervals.map(&:notes).compact
+  end
+
+  def non_suspension_dissonant_intervals
+    dissonant_intervals.reject { |interval| tied_suspension?(interval) }
   end
 
   def dissonant_intervals
     downbeat_harmonic_intervals.select { |interval| interval.dissonance?(:two_part_harmony) }
   end
+
+  def tied_suspension?(interval)
+    cp_note = voice.note_at(interval.position)
+    return false unless cp_note
+
+    cp_note.position < interval.position
+  end
 end

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

@@ -0,0 +1,71 @@
+# Module for style guidelines.
+module HeadMusic::Style::Guidelines; end
+
+# Shared detection of ornamental dissonance figures (nota cambiata, double neighbor).
+# Include in any dissonance treatment guideline that needs to recognize these figures.
+# Expects the including class to provide: #notes, #dissonant_with_cantus?(note)
+module HeadMusic::Style::Guidelines::DissonanceFigureDetection
+  private
+
+  # Nota cambiata: a five-note figure where note 2 is dissonant,
+  # approached by step from note 1, leaps a third in the same direction to note 3,
+  # then notes 3-4-5 proceed stepwise in the opposite direction.
+  # Notes 1, 3, and 5 must be consonant with the CF.
+  def cambiata_dissonance?(note)
+    index = notes.index(note)
+    return false unless index
+
+    cambiata_as_note_2?(index)
+  end
+
+  def double_neighbor_member?(note)
+    index = notes.index(note)
+    return false unless index
+
+    double_neighbor_figure?(index, offset: 1) || double_neighbor_figure?(index, offset: 2)
+  end
+
+  def cambiata_as_note_2?(index)
+    return false if index < 1 || index + 3 > notes.length - 1
+
+    n1, n2, n3, n4, n5 = notes[index - 1, 5]
+
+    approach = melodic_interval_between(n1, n2)
+    leap = melodic_interval_between(n2, n3)
+    step_back_1 = melodic_interval_between(n3, n4)
+    step_back_2 = melodic_interval_between(n4, n5)
+
+    approach.step? &&
+      leap.number == 3 && approach.direction == leap.direction &&
+      step_back_1.step? && step_back_2.step? &&
+      step_back_1.direction != leap.direction &&
+      step_back_2.direction != leap.direction &&
+      consonant_with_cantus?(n1) && consonant_with_cantus?(n3) && consonant_with_cantus?(n5)
+  end
+
+  # Double neighbor: a four-note figure within one bar.
+  # Beats 1 and 4 are the same pitch (consonant), beats 2 and 3 are
+  # upper and lower neighbors connected by a leap of a third.
+  def double_neighbor_figure?(index, offset:)
+    start = index - offset
+    return false if start < 0 || start + 3 > notes.length - 1
+
+    n1, n2, n3, n4 = notes[start, 4]
+
+    approach = melodic_interval_between(n1, n2)
+    middle = melodic_interval_between(n2, n3)
+    departure = melodic_interval_between(n3, n4)
+
+    approach.step? && middle.number == 3 && departure.step? &&
+      n1.pitch == n4.pitch &&
+      consonant_with_cantus?(n1) && consonant_with_cantus?(n4)
+  end
+
+  def consonant_with_cantus?(note)
+    !dissonant_with_cantus?(note)
+  end
+
+  def melodic_interval_between(note1, note2)
+    HeadMusic::Analysis::MelodicInterval.new(note1, note2)
+  end
+end

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

@@ -3,10 +3,13 @@ module HeadMusic::Style::Guidelines; end
 
 # Unified dissonance handling for mixed-species (florid) contexts.
 # - Strong beat dissonances must be properly prepared suspensions from a tie.
-# - Weak beat dissonances must be passing tones or neighbor tones.
+# - Weak beat dissonances must be passing tones, neighbor tones, nota cambiata, or double neighbor figures.
 # - Tied notes dissonant at the new CF note must resolve by step to a consonance.
 class HeadMusic::Style::Guidelines::FloridDissonanceTreatment < HeadMusic::Style::Annotation
-  MESSAGE = "Treat dissonances appropriately: passing tones on weak beats, proper suspension treatment for tied notes."
+  include HeadMusic::Style::Guidelines::DissonanceFigureDetection
+
+  MESSAGE = "Treat dissonances appropriately: passing tones, cambiata, or double neighbor " \
+    "on weak beats; proper suspension treatment for tied notes."
 
   def marks
     return [] unless cantus_firmus&.notes&.any?
@@ -24,7 +27,8 @@ class HeadMusic::Style::Guidelines::FloridDissonanceTreatment < HeadMusic::Style
     if on_strong_beat?(note)
       properly_treated_suspension?(note)
     else
-      passing_tone?(note) || neighbor_tone?(note)
+      passing_tone?(note) || neighbor_tone?(note) ||
+        cambiata_dissonance?(note) || double_neighbor_member?(note)
     end
   end
 
@@ -42,11 +46,10 @@ class HeadMusic::Style::Guidelines::FloridDissonanceTreatment < HeadMusic::Style
     next_cp = following_note(note)
     return false unless next_cp
 
-    melodic = HeadMusic::Analysis::MelodicInterval.new(note, next_cp)
+    melodic = melodic_interval_between(note, next_cp)
     return false unless melodic.step?
 
-    # Resolution must be consonant
-    !dissonant_with_cantus?(next_cp)
+    consonant_with_cantus?(next_cp)
   end
 
   def on_strong_beat?(note)
@@ -79,8 +82,8 @@ class HeadMusic::Style::Guidelines::FloridDissonanceTreatment < HeadMusic::Style
     next_note = following_note(note)
     return false unless prev_note && next_note
 
-    approach = HeadMusic::Analysis::MelodicInterval.new(prev_note, note)
-    departure = HeadMusic::Analysis::MelodicInterval.new(note, next_note)
+    approach = melodic_interval_between(prev_note, note)
+    departure = melodic_interval_between(note, next_note)
     approach.step? && departure.step? && (approach.direction == departure.direction) == same_direction
   end
 

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

@@ -1,14 +1,14 @@
 # Module for style guidelines.
 module HeadMusic::Style::Guidelines; end
 
-# Checks that the voice uses at least 2 different rhythmic value durations.
-# For full fifth species counterpoint.
+# Checks that the voice uses at least 3 different rhythmic value durations.
+# Florid counterpoint requires a genuine mixture of species textures.
 class HeadMusic::Style::Guidelines::MixedRhythmicValues < HeadMusic::Style::Annotation
-  MESSAGE = "Use a variety of rhythmic values for an expressive florid line."
+  MESSAGE = "Use at least three different rhythmic values for a truly florid line."
 
   def marks
     return [] if notes.length < 2
-    return [] if distinct_durations_count >= 2
+    return [] if distinct_durations_count >= 3
 
     [HeadMusic::Style::Mark.for(notes.first)]
   end

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

@@ -5,9 +5,9 @@ module HeadMusic::Style::Guidelines; end
 # A suspension has three parts:
 # 1. Preparation: The note is consonant with the current cantus firmus note.
 # 2. Suspension: The cantus firmus moves; the counterpoint sustains, becoming dissonant.
-# 3. Resolution: The counterpoint resolves by step (usually down) to a consonance.
+# 3. Resolution: The counterpoint resolves by step down to a consonance.
 class HeadMusic::Style::Guidelines::SuspensionTreatment < HeadMusic::Style::Annotation
-  MESSAGE = "Treat suspensions with proper preparation and stepwise resolution."
+  MESSAGE = "Treat suspensions with proper preparation and downward stepwise resolution."
 
   def marks
     return [] unless cantus_firmus&.notes&.any?
@@ -52,7 +52,7 @@ class HeadMusic::Style::Guidelines::SuspensionTreatment < HeadMusic::Style::Anno
     return false unless next_cp
 
     melodic = HeadMusic::Analysis::MelodicInterval.new(cp_note, next_cp)
-    return false unless melodic.step?
+    return false unless melodic.step? && melodic.descending?
 
     resolution_interval = HeadMusic::Analysis::HarmonicInterval.new(cantus_firmus, voice, next_cp.position)
     resolution_interval.notes.length == 2 && resolution_interval.consonance?(:two_part_harmony)

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

@@ -5,6 +5,8 @@ module HeadMusic::Style::Guidelines; end
 # Every dissonant note on beats 2, 3, or 4 must be treated as a passing tone,
 # neighbor tone, nota cambiata, or double neighbor figure.
 class HeadMusic::Style::Guidelines::ThirdSpeciesDissonanceTreatment < HeadMusic::Style::Guidelines::WeakBeatDissonanceTreatment
+  include HeadMusic::Style::Guidelines::DissonanceFigureDetection
+
   MESSAGE = "Treat dissonances as passing tones, neighbor tones, cambiata, or double neighbor figures."
 
   private
@@ -17,69 +19,4 @@ class HeadMusic::Style::Guidelines::ThirdSpeciesDissonanceTreatment < HeadMusic:
   def neighbor_tone?(note)
     stepwise_figure?(note, same_direction: false)
   end
-
-  # Nota cambiata: a five-note figure where note 2 is dissonant,
-  # approached by step from note 1, leaps a third in the same direction to note 3,
-  # then notes 3-4-5 proceed stepwise in the opposite direction.
-  # Notes 1, 3, and 5 must be consonant with the CF.
-  def cambiata_dissonance?(note)
-    index = notes.index(note)
-    return false unless index
-
-    cambiata_as_note_2?(index)
-  end
-
-  def cambiata_as_note_2?(index)
-    return false if index < 1 || index + 3 > notes.length - 1
-
-    n1 = notes[index - 1]
-    n2 = notes[index]
-    n3 = notes[index + 1]
-    n4 = notes[index + 2]
-    n5 = notes[index + 3]
-
-    approach = melodic_interval_between(n1, n2)
-    leap = melodic_interval_between(n2, n3)
-    step_back_1 = melodic_interval_between(n3, n4)
-    step_back_2 = melodic_interval_between(n4, n5)
-
-    approach.step? &&
-      leap.number == 3 && approach.direction == leap.direction &&
-      step_back_1.step? && step_back_2.step? &&
-      step_back_1.direction != leap.direction &&
-      step_back_2.direction != leap.direction &&
-      consonant_with_cantus?(n1) && consonant_with_cantus?(n3) && consonant_with_cantus?(n5)
-  end
-
-  # Double neighbor: a four-note figure within one bar.
-  # Beats 1 and 4 are the same pitch (consonant), beats 2 and 3 are
-  # upper and lower neighbors connected by a leap of a third.
-  def double_neighbor_member?(note)
-    index = notes.index(note)
-    return false unless index
-
-    double_neighbor_figure?(index, offset: 1) || double_neighbor_figure?(index, offset: 2)
-  end
-
-  # Check for a double-neighbor four-note figure where the given index
-  # is note number (offset + 1) in the figure. offset=1 means note 2,
-  # offset=2 means note 3.
-  def double_neighbor_figure?(index, offset:)
-    start = index - offset
-    return false if start < 0 || start + 3 > notes.length - 1
-
-    n1, n2, n3, n4 = notes[start, 4]
-
-    approach = melodic_interval_between(n1, n2)
-    middle = melodic_interval_between(n2, n3)
-    departure = melodic_interval_between(n3, n4)
-
-    approach.step? && middle.number == 3 && departure.step? &&
-      n1.pitch == n4.pitch &&
-      consonant_with_cantus?(n1) && consonant_with_cantus?(n4)
-  end
-
-  def consonant_with_cantus?(note)
-    !dissonant_with_cantus?(note)
-  end
 end

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

@@ -8,8 +8,10 @@ class HeadMusic::Style::Guides::FifthSpeciesHarmony < HeadMusic::Style::Guides::
     HeadMusic::Style::Guidelines::AvoidCrossingVoices,
     HeadMusic::Style::Guidelines::AvoidOverlappingVoices,
     HeadMusic::Style::Guidelines::ConsonantDownbeats,
+    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,

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

@@ -11,10 +11,12 @@ class HeadMusic::Style::Guides::FifthSpeciesMelody < HeadMusic::Style::Guides::S
     HeadMusic::Style::Guidelines::FrequentDirectionChanges,
     HeadMusic::Style::Guidelines::LimitOctaveLeaps,
     HeadMusic::Style::Guidelines::MostlyConjunct,
+    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,

data/lib/head_music/version.rb

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