head_music 11.2.0 → 11.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 612ae51821bb032f85973fb28527749fdbc8e07291cdfcfbfd6936c204e21829
-  data.tar.gz: 6b10642629a73a596b6100e53dde57b8a00cca92ba6fa340c21713e1955167d0
+  metadata.gz: 4d8882c692b8b956f3856e601c37ce271c86b513064071d69b8e6965d67d8514
+  data.tar.gz: 9c14060294dfc59bb6abc768f5090edec67bdb65ef3c8e4ad6c7079b4fec93df
 SHA512:
-  metadata.gz: a26c1c53f68e7e0bf6623005877a5174d2cbf429faa8c08cbcf36ecaaaee8b114b04b1426d4eb20e1b661da17fafeae9c170e6370aef38455ac43180d4b2714e
-  data.tar.gz: ca47a804546899e9c3fb057ef9de8908e15f2da2ea27a98b29926406c0bf4ecd9818ed08efc7177f92e2f0eeaf20cc4527f0a69afbae49ebc46e9e414f5c55a1
+  metadata.gz: f0803c09f157ec3331c3e3921c5fb9d3ec2873b7655a54f2d4dc518613d4059f470eaf17900c1f2f28fbd274fe15e4a53d7603c65f2b6dacd550dc596b57c872
+  data.tar.gz: f98d4b7e8fdfdae06ca3e116ebf19793151abaeeb5c3535708181abcb3b8d9deae965262da7f69fab6ca6e29065832f253532b186dfa0bfc0e98d8c4a80f2e90

data/Gemfile.lock

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

data/lib/head_music/content/cantus_firmus/example.rb

@@ -0,0 +1,58 @@
+module HeadMusic
+  module Content
+    module CantusFirmus
+      # Sample cantus firmus examples from various pedagogical sources.
+      # These are traditional melodies used for teaching counterpoint.
+      class Example
+        EXAMPLES_DATA = YAML.load_file(File.expand_path("examples.yml", __dir__)).freeze
+
+        attr_reader :source, :tonal_center, :mode, :pitches
+
+        class << self
+          def all
+            @all ||= EXAMPLES_DATA["cantus_firmus_examples"].map do |data|
+              new(data: data)
+            end
+          end
+
+          def by_source(source_identifier)
+            source = Source.get(source_identifier)
+            return [] unless source
+
+            all.select { |example| example.source == source }
+          end
+
+          def sources
+            all.map(&:source).uniq
+          end
+
+          def by_mode(mode_name)
+            normalized_mode = mode_name.to_s.downcase
+            all.select { |example| example.mode.to_s.downcase == normalized_mode }
+          end
+
+          def by_tonal_center(tonal_center_name)
+            all.select { |example| example.tonal_center.to_s == tonal_center_name.to_s }
+          end
+        end
+
+        def initialize(data:)
+          @source = Source.get(data["source"])
+          @tonal_center = data["tonal_center"]
+          @mode = data["mode"]&.to_sym
+          @pitches = data["pitches"] || []
+        end
+
+        def length
+          pitches.length
+        end
+
+        def to_s
+          "#{tonal_center} #{mode} (#{source})"
+        end
+
+        private_class_method :new
+      end
+    end
+  end
+end

data/lib/head_music/content/cantus_firmus/examples.yml

@@ -0,0 +1,115 @@
+cantus_firmus_examples:
+  - source: "Fux"
+    tonal_center: D
+    mode: dorian
+    pitches: ["D", "F", "E", "D", "G", "F", "A", "G", "F", "E", "D"]
+
+  - source: "Fux"
+    tonal_center: E
+    mode: phrygian
+    pitches: ["E", "C", "D", "C", "A3", "A", "G", "E", "F", "E"]
+
+  - source: "Fux"
+    tonal_center: F
+    mode: lydian
+    pitches: ["F", "G", "A", "F", "D", "E", "F", "C5", "A", "F", "G", "F"]
+
+  - source: "Fux"
+    tonal_center: G
+    mode: mixolydian
+    pitches: ["G3", "C", "B3", "G3", "C", "E", "D", "G", "E", "C", "D", "B3", "A3", "G3"]
+
+  - source: "Fux"
+    tonal_center: A
+    mode: aeolian
+    pitches: ["A3", "C", "B3", "D", "C", "E", "F", "E", "D", "C", "B3", "A3"]
+
+  - source: "Fux"
+    tonal_center: C
+    mode: ionian
+    pitches: ["C", "E", "F", "G", "E", "A", "G", "E", "F", "E", "D", "C"]
+
+  - source: "Fux"
+    tonal_center: C
+    mode: ionian
+    pitches: ["C", "E", "F", "E", "G", "F", "E", "D", "C"]
+
+  - source: "Clendinning & Marvin"
+    tonal_center: F
+    mode: ionian
+    pitches: ["F3", "G3", "A3", "F3", "D3", "E3", "F3", "C4", "A3", "F3", "G3", "F3"]
+
+  - source: "Clendinning & Marvin"
+    tonal_center: D
+    mode: aeolian
+    pitches: ["D3", "A3", "G3", "F3", "E3", "D3", "F3", "E3", "D3"]
+
+  - source: "Clendinning & Marvin"
+    tonal_center: C
+    mode: ionian
+    pitches: ["C", "D", "F", "E", "F", "G", "A", "G", "E", "D", "C"]
+
+  - source: "Clendinning & Marvin"
+    tonal_center: C
+    mode: ionian
+    pitches: ["C3", "E3", "F3", "G3", "E3", "A3", "G3", "E3", "F3", "E3", "D3", "C3"]
+
+  - source: "Davis & Lybbert"
+    tonal_center: C
+    mode: ionian
+    pitches: ["C3", "E3", "D3", "G3", "A3", "G3", "E3", "F3", "D3", "C3"]
+
+  - source: "Davis & Lybbert"
+    tonal_center: C
+    mode: ionian
+    pitches: ["C3", "D3", "E3", "G3", "A3", "F3", "E3", "D3", "C3"]
+
+  - source: "Davis & Lybbert"
+    tonal_center: G
+    mode: ionian
+    pitches: ["G3", "F#3", "G3", "E3", "D3", "B2", "C3", "D3", "B2", "A2", "G2"]
+
+  - source: "Davis & Lybbert"
+    tonal_center: G
+    mode: ionian
+    pitches: ["G2", "B2", "C3", "D3", "E3", "D3", "B2", "C3", "A2", "G2"]
+
+  - source: "Davis & Lybbert"
+    tonal_center: F
+    mode: ionian
+    pitches: ["F3", "D3", "C3", "F3", "G3", "A3", "E3", "D3", "G3", "F3"]
+
+  - source: "Davis & Lybbert"
+    tonal_center: A
+    mode: aeolian
+    pitches: ["A2", "E3", "C3", "D3", "B2", "G2", "A2", "C3", "B2", "A2"]
+
+  - source: "Davis & Lybbert"
+    tonal_center: A
+    mode: aeolian
+    pitches: ["A2", "B2", "C3", "D3", "E3", "F3", "E3", "C3", "B2", "A2"]
+
+  - source: "Davis & Lybbert"
+    tonal_center: E
+    mode: aeolian
+    pitches: ["E3", "A3", "B3", "G3", "C4", "A3", "B3", "G3", "F#3", "E3"]
+
+  - source: "Davis & Lybbert"
+    tonal_center: E
+    mode: aeolian
+    pitches: ["E3", "D3", "C3", "B2", "G2", "A2", "B2", "E3", "G3", "F#3", "E3"]
+
+  - source: "Davis & Lybbert"
+    tonal_center: D
+    mode: aeolian
+    pitches: ["D3", "F3", "E3", "G3", "F3", "D3", "A3", "G3", "F3", "E3", "D3"]
+
+  - source: "Schoenberg"
+    tonal_center: Eb
+    mode: ionian
+    pitches: ["Eb", "D", "G3", "Ab3", "C", "Ab3", "F3", "Eb3"]
+
+  - source: "Schoenberg"
+    tonal_center: A
+    mode: ionian
+    pitches: ["A3", "C#4", "B3", "F#3", "A3", "F#3", "G#3", "A3"]

data/lib/head_music/content/cantus_firmus/source.rb

@@ -0,0 +1,58 @@
+module HeadMusic
+  module Content
+    module CantusFirmus
+      # A pedagogical source of cantus firmus examples.
+      # Sources include books and treatises on counterpoint.
+      class Source
+        SOURCES_DATA = YAML.load_file(File.expand_path("sources.yml", __dir__)).freeze
+
+        attr_reader :key, :publication_name, :publication_edition, :author_names, :notes
+
+        class << self
+          def all
+            @all ||= SOURCES_DATA["cantus_firmus_sources"].map do |key, data|
+              new(key: key, data: data)
+            end
+          end
+
+          def get(identifier)
+            return identifier if identifier.is_a?(self)
+
+            normalized_key = normalize_key(identifier)
+            all.find { |source| source.key == normalized_key }
+          end
+
+          def keys
+            all.map(&:key)
+          end
+
+          private
+
+          # Normalize various source name formats to the YAML key format
+          # e.g., "Fux" -> "fux", "Clendinning & Marvin" -> "clendinning_and_marvin"
+          def normalize_key(identifier)
+            identifier.to_s
+                      .downcase
+                      .gsub(/\s*&\s*/, "_and_")
+                      .gsub(/\s+/, "_")
+                      .to_sym
+          end
+        end
+
+        def initialize(key:, data:)
+          @key = key.to_sym
+          @publication_name = data["publication_name"]
+          @publication_edition = data["publication_edition"]
+          @author_names = data["author_names"] || []
+          @notes = data["notes"]&.strip
+        end
+
+        def to_s
+          publication_name
+        end
+
+        private_class_method :new
+      end
+    end
+  end
+end

data/lib/head_music/content/cantus_firmus/sources.yml

@@ -0,0 +1,28 @@
+cantus_firmus_sources:
+  fux:
+    publication_name: Gradus ad Parnassum
+    author_names:
+    - Johann Joseph Fux
+    notes: >
+      A foundational text on counterpoint by Johann Joseph Fux, first published in 1725.
+  clendinning_and_marvin:
+    publication_name: The Musician's Guide to Theory and Analysis
+    publication_edition: 3rd
+    author_names:
+    - Jane Piper Clendinning
+    - Elizabeth West Marvin
+    notes: >
+      A contemporary guide to music theory and analysis, widely used in music education.
+  davis_and_lybbert:
+    publication_name: The Essentials of Counterpoint
+    author_names:
+    - Ferdinand Davis
+    - Donald Lybbert
+    notes: >
+      A comprehensive text on counterpoint techniques and practices.
+  schoenberg:
+    publication_name: Preliminary Exercises in Counterpoint
+    author_names:
+    - Arnold Schoenberg
+    notes: >
+      A set of exercises by Arnold Schoenberg designed to teach the fundamentals of counterpoint.

data/lib/head_music/version.rb

@@ -1,3 +1,3 @@
 module HeadMusic
-  VERSION = "11.2.0"
+  VERSION = "11.3.0"
 end

data/lib/head_music.rb

@@ -110,7 +110,8 @@ require "head_music/instruments/score_order"
 
 # content
 require "head_music/content/bar"
-require "head_music/content/cantus_firmus_examples"
+require "head_music/content/cantus_firmus/source"
+require "head_music/content/cantus_firmus/example"
 require "head_music/content/composition"
 require "head_music/content/note"
 require "head_music/content/placement"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: head_music
 version: !ruby/object:Gem::Version
-  version: 11.2.0
+  version: 11.3.0
 platform: ruby
 authors:
 - Rob Head
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-01-29 00:00:00.000000000 Z
+date: 2026-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -181,7 +181,10 @@ files:
 - lib/head_music/analysis/pitch_collection.rb
 - lib/head_music/analysis/sonority.rb
 - lib/head_music/content/bar.rb
-- lib/head_music/content/cantus_firmus_examples.rb
+- lib/head_music/content/cantus_firmus/example.rb
+- lib/head_music/content/cantus_firmus/examples.yml
+- lib/head_music/content/cantus_firmus/source.rb
+- lib/head_music/content/cantus_firmus/sources.yml
 - lib/head_music/content/composition.rb
 - lib/head_music/content/note.rb
 - lib/head_music/content/placement.rb

data/lib/head_music/content/cantus_firmus_examples.rb

@@ -1,58 +0,0 @@
-module HeadMusic
-  module Content
-    # Sample cantus firmus examples from various pedagogical sources.
-    # These are traditional melodies used for teaching counterpoint.
-    module CantusFirmusExamples
-      FUX = [
-        {source: "Fux", tonality: "D dorian", pitches: %w[D F E D G F A G F E D]},
-        {source: "Fux", tonality: "E phrygian", pitches: %w[E C D C A3 A G E F E]},
-        {source: "Fux", tonality: "F lydian", pitches: %w[F G A F D E F C5 A F G F]},
-        {source: "Fux", tonality: "G mixolydian", pitches: %w[G3 C B3 G3 C E D G E C D B3 A3 G3]},
-        {source: "Fux", tonality: "A aeolian", pitches: %w[A3 C B3 D C E F E D C B3 A3]},
-        {source: "Fux", tonality: "C ionian", pitches: %w[C E F G E A G E F E D C]},
-        {source: "Fux", tonality: "C ionian", pitches: %w[C E F E G F E D C]}
-      ].freeze
-
-      CLENDINNING = [
-        {source: "Clendinning", name: "F major", tonality: "F major", pitches: %w[F3 G3 A3 F3 D3 E3 F3 C4 A3 F3 G3 F3]},
-        {source: "Clendinning", name: "D minor", tonality: "D minor", pitches: %w[D3 A3 G3 F3 E3 D3 F3 E3 D3]},
-        {source: "Clendinning", name: "C major (treble)", tonality: "C major", pitches: %w[C D F E F G A G E D C]},
-        {source: "Clendinning", name: "C major (bass)", tonality: "C major", pitches: %w[C3 E3 F3 G3 E3 A3 G3 E3 F3 E3 D3 C3]}
-      ].freeze
-
-      DAVIS_AND_LYBBERT = [
-        {source: "Davis & Lybbert", name: "CF 1 in C major", tonality: "C major", pitches: %w[C3 E3 D3 G3 A3 G3 E3 F3 D3 C3]},
-        {source: "Davis & Lybbert", name: "CF 2 in C major", tonality: "C major", pitches: %w[C3 D3 E3 G3 A3 F3 E3 D3 C3]},
-        {source: "Davis & Lybbert", name: "CF 3 in G major", tonality: "G major", pitches: %w[G3 F#3 G3 E3 D3 B2 C3 D3 B2 A2 G2]},
-        {source: "Davis & Lybbert", name: "CF 4 in G major", tonality: "G major", pitches: %w[G2 B2 C3 D3 E3 D3 B2 C3 A2 G2]},
-        {source: "Davis & Lybbert", name: "CF 5 in F major", tonality: "F major", pitches: %w[F3 D3 C3 F3 G3 A3 E3 D3 G3 F3]},
-        {source: "Davis & Lybbert", name: "CF 6 in A minor", tonality: "A minor", pitches: %w[A2 E3 C3 D3 B2 G2 A2 C3 B2 A2]},
-        {source: "Davis & Lybbert", name: "CF 7 in A minor", tonality: "A minor", pitches: %w[A2 B2 C3 D3 E3 F3 E3 C3 B2 A2]},
-        {source: "Davis & Lybbert", name: "CF 8 in E minor", tonality: "E minor", pitches: %w[E3 A3 B3 G3 C4 A3 B3 G3 F#3 E3]},
-        {source: "Davis & Lybbert", name: "CF 9 in E minor", tonality: "E minor", pitches: %w[E3 D3 C3 B2 G2 A2 B2 E3 G3 F#3 E3]},
-        {source: "Davis & Lybbert", name: "CF 10 in D minor", tonality: "D minor", pitches: %w[D3 F3 E3 G3 F3 D3 A3 G3 F3 E3 D3]}
-      ].freeze
-
-      SCHOENBERG = [
-        {source: "Schoenberg", tonality: "Eb major", pitches: %w[Eb D G3 Ab3 C Ab3 F3 Eb3]},
-        {source: "Schoenberg", tonality: "A major", pitches: %w[A3 C#4 B3 F#3 A3 F#3 G#3 A3]}
-      ].freeze
-
-      EXAMPLES = (FUX + CLENDINNING + DAVIS_AND_LYBBERT + SCHOENBERG).freeze
-
-      class << self
-        def all
-          EXAMPLES
-        end
-
-        def by_source(source)
-          EXAMPLES.select { |ex| ex[:source] == source }
-        end
-
-        def sources
-          EXAMPLES.map { |ex| ex[:source] }.uniq
-        end
-      end
-    end
-  end
-end