head_music 7.0.5 → 8.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 439ca8119659028d43f890f43e29444ea74331cb31d24815b884a72f2a6ca605
-  data.tar.gz: 95fef4618cb6509beb136d71a3479503ea21baabe3f667cb5573fca0a2aad2c6
+  metadata.gz: 4e3d6ab19fbe0d2fb36ef83bd77eb6e029af7e1ce7e0c78b40bdf0945c114a64
+  data.tar.gz: 7392a202e8e2beeb1582116592d99ec2b61ca108227812c335b145ee1664d4d3
 SHA512:
-  metadata.gz: c8ab71c5d885903398df2cd6be94be41e64df4eaea057843882f4693453bc8116576957fff07ce870e2d5b5c255a14dc58a8985c7bdbc3add88dbe1ca784f0f4
-  data.tar.gz: 73ef33e9f539baf59412e511f755819e67ac54177bcd9cd642a21347e11d38bcef6c8d8df918f41dfc5103def3e1fb99abf80a4b69cc084be8459c681cff1c5e
+  metadata.gz: c53c0f8a7bb12f7891aa331ce14a8746d89732b6f04dc92aa3793ec22f1d0ac4bcba0662d423f5bc82a553f5c97548b4d951e0a369e8bf809f8b162919211359
+  data.tar.gz: 3a92eb3616549a5efbbea45f239241262cb82f704dc78bfe64e9a4943e488389f6f9c95d5b169d813615ad8678e5bf11c44c1bf62b95d67d996a80801ef4a4fe

data/.ruby-version

@@ -1 +1 @@
-3.2.2
+3.3.0

data/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-ruby "3.2.2"
+ruby "3.3.0"
 
 # Specify your gem's dependencies in head_music.gemspec
 gemspec

data/lib/head_music/{circle.rb → analysis/circle.rb}

@@ -1,7 +1,10 @@
-require "head_music/interval_cycle"
+require "head_music/analysis/interval_cycle"
+
+# A module for musical analysis
+module HeadMusic::Analysis; end
 
 # A Circle of Fifths or Fourths shows relationships between pitch classes
-class HeadMusic::Circle < HeadMusic::IntervalCycle
+class HeadMusic::Analysis::Circle < HeadMusic::Analysis::IntervalCycle
   def self.of_fifths
     get(:perfect_fifth)
   end
@@ -12,20 +15,20 @@ class HeadMusic::Circle < HeadMusic::IntervalCycle
 
   def self.get(interval = :perfect_fifth)
     @circles ||= {}
-    diatonic_interval = HeadMusic::DiatonicInterval.get(interval)
+    diatonic_interval = HeadMusic::Analysis::DiatonicInterval.get(interval)
     @circles[interval] ||= new(interval: diatonic_interval, starting_pitch: "C4")
   end
 
   def index(pitch_class)
-    pitch_classes.index(HeadMusic::Spelling.get(pitch_class).pitch_class)
+    pitch_classes.index(HeadMusic::Rudiment::Spelling.get(pitch_class).pitch_class)
   end
 
   def key_signatures_up
-    spellings_up.map { |spelling| HeadMusic::KeySignature.new(spelling) }
+    spellings_up.map { |spelling| HeadMusic::Rudiment::KeySignature.new(spelling) }
   end
 
   def key_signatures_down
-    spellings_down.map { |spelling| HeadMusic::KeySignature.new(spelling) }
+    spellings_down.map { |spelling| HeadMusic::Rudiment::KeySignature.new(spelling) }
   end
 
   def spellings_up

data/lib/head_music/{diatonic_interval → analysis/diatonic_interval}/category.rb

@@ -1,5 +1,5 @@
 # Accepts the letter name count between two notes and categorizes the interval
-class HeadMusic::DiatonicInterval::Category
+class HeadMusic::Analysis::DiatonicInterval::Category
   attr_reader :number
 
   def initialize(number)

data/lib/head_music/{diatonic_interval → analysis/diatonic_interval}/naming.rb

@@ -1,8 +1,8 @@
 # Accepts a number and number of semitones and privides the naming methods.
-class HeadMusic::DiatonicInterval::Naming
-  QUALITY_SEMITONES = HeadMusic::DiatonicInterval::QUALITY_SEMITONES
-  NUMBER_NAMES = HeadMusic::DiatonicInterval::NUMBER_NAMES
-  NAME_SUFFIXES = HeadMusic::DiatonicInterval::NAME_SUFFIXES
+class HeadMusic::Analysis::DiatonicInterval::Naming
+  QUALITY_SEMITONES = HeadMusic::Analysis::DiatonicInterval::QUALITY_SEMITONES
+  NUMBER_NAMES = HeadMusic::Analysis::DiatonicInterval::NUMBER_NAMES
+  NAME_SUFFIXES = HeadMusic::Analysis::DiatonicInterval::NAME_SUFFIXES
 
   attr_reader :number, :semitones
 
@@ -23,7 +23,7 @@ class HeadMusic::DiatonicInterval::Naming
     starting_quality = QUALITY_SEMITONES[simple_number_name.to_sym].keys.first
     delta = simple_semitones - (QUALITY_SEMITONES[simple_number_name.to_sym][starting_quality] % 12)
     delta -= 12 while delta >= 6
-    HeadMusic::Quality.from(starting_quality, delta)
+    HeadMusic::Rudiment::Quality.from(starting_quality, delta)
   end
 
   def simple_number_name
@@ -60,7 +60,7 @@ class HeadMusic::DiatonicInterval::Naming
   end
 
   def quality
-    @quality ||= HeadMusic::Quality.get(quality_name)
+    @quality ||= HeadMusic::Rudiment::Quality.get(quality_name)
   end
 
   def octaves

data/lib/head_music/{diatonic_interval → analysis/diatonic_interval}/parser.rb

@@ -1,5 +1,5 @@
-class HeadMusic::DiatonicInterval::Parser
-  NUMBER_NAMES = HeadMusic::DiatonicInterval::NUMBER_NAMES
+class HeadMusic::Analysis::DiatonicInterval::Parser
+  NUMBER_NAMES = HeadMusic::Analysis::DiatonicInterval::NUMBER_NAMES
 
   attr_reader :identifier
 
@@ -24,7 +24,7 @@ class HeadMusic::DiatonicInterval::Parser
   end
 
   def higher_letter
-    HeadMusic::Pitch.middle_c.letter_name.steps_up(steps)
+    HeadMusic::Rudiment::Pitch.middle_c.letter_name.steps_up(steps)
   end
 
   def expand(identifier)
@@ -36,7 +36,7 @@ class HeadMusic::DiatonicInterval::Parser
   end
 
   def quality_abbreviations
-    HeadMusic::DiatonicInterval::QUALITY_ABBREVIATIONS
+    HeadMusic::Analysis::DiatonicInterval::QUALITY_ABBREVIATIONS
   end
 
   def quality_for(abbreviation)

data/lib/head_music/{diatonic_interval → analysis/diatonic_interval}/semitones.rb

@@ -1,6 +1,6 @@
 # Accepts a name and a quality and returns the number of semitones
-class HeadMusic::DiatonicInterval::Semitones
-  QUALITY_SEMITONES = HeadMusic::DiatonicInterval::QUALITY_SEMITONES
+class HeadMusic::Analysis::DiatonicInterval::Semitones
+  QUALITY_SEMITONES = HeadMusic::Analysis::DiatonicInterval::QUALITY_SEMITONES
 
   attr_reader :count
 
@@ -28,9 +28,9 @@ class HeadMusic::DiatonicInterval::Semitones
 
   def self._degree_quality_modifications(quality)
     if quality == :perfect
-      HeadMusic::Quality::PERFECT_INTERVAL_MODIFICATION.invert
+      HeadMusic::Rudiment::Quality::PERFECT_INTERVAL_MODIFICATION.invert
     else
-      HeadMusic::Quality::MAJOR_INTERVAL_MODIFICATION.invert
+      HeadMusic::Rudiment::Quality::MAJOR_INTERVAL_MODIFICATION.invert
     end
   end
 end

data/lib/head_music/{diatonic_interval → analysis/diatonic_interval}/size.rb

@@ -1,5 +1,5 @@
 # Encapsulate the distance methods of the interval
-class HeadMusic::DiatonicInterval::Size
+class HeadMusic::Analysis::DiatonicInterval::Size
   attr_reader :low_pitch, :high_pitch
 
   def initialize(pitch1, pitch2)

data/lib/head_music/{diatonic_interval.rb → analysis/diatonic_interval.rb}

@@ -1,5 +1,8 @@
+# A module for musical analysis
+module HeadMusic::Analysis; end
+
 # A diatonic interval is the distance between two spelled pitches.
-class HeadMusic::DiatonicInterval
+class HeadMusic::Analysis::DiatonicInterval
   include Comparable
 
   # TODO: include Named module
@@ -59,33 +62,33 @@ class HeadMusic::DiatonicInterval
   def self.get(identifier)
     name = Parser.new(identifier)
     semitones = Semitones.new(name.degree_name.to_sym, name.quality_name).count
-    higher_pitch = HeadMusic::Pitch.from_number_and_letter(HeadMusic::Pitch.middle_c + semitones, name.higher_letter)
-    new(HeadMusic::Pitch.middle_c, higher_pitch)
+    higher_pitch = HeadMusic::Rudiment::Pitch.from_number_and_letter(HeadMusic::Rudiment::Pitch.middle_c + semitones, name.higher_letter)
+    new(HeadMusic::Rudiment::Pitch.middle_c, higher_pitch)
   end
 
   def initialize(pitch1, pitch2)
-    pitch1 = HeadMusic::Pitch.get(pitch1)
-    pitch2 = HeadMusic::Pitch.get(pitch2)
+    pitch1 = HeadMusic::Rudiment::Pitch.get(pitch1)
+    pitch2 = HeadMusic::Rudiment::Pitch.get(pitch2)
     @lower_pitch, @higher_pitch = [pitch1, pitch2].sort
   end
 
   def quality
-    HeadMusic::Quality.get(quality_name)
+    HeadMusic::Rudiment::Quality.get(quality_name)
   end
 
   def inversion
     inverted_low_pitch = lower_pitch
     while inverted_low_pitch < higher_pitch
-      inverted_low_pitch = HeadMusic::Pitch.fetch_or_create(lower_pitch.spelling, inverted_low_pitch.register + 1)
+      inverted_low_pitch = HeadMusic::Rudiment::Pitch.fetch_or_create(lower_pitch.spelling, inverted_low_pitch.register + 1)
     end
-    HeadMusic::DiatonicInterval.new(higher_pitch, inverted_low_pitch)
+    HeadMusic::Analysis::DiatonicInterval.new(higher_pitch, inverted_low_pitch)
   end
   alias_method :invert, :inversion
 
   def consonance(style = :standard_practice)
     consonance_for_perfect(style) ||
       consonance_for_major_and_minor ||
-      HeadMusic::Consonance.get(:dissonant)
+      HeadMusic::Rudiment::Consonance.get(:dissonant)
   end
 
   def consonance?(style = :standard_practice)
@@ -106,13 +109,13 @@ class HeadMusic::DiatonicInterval
   end
 
   def above(pitch)
-    pitch = HeadMusic::Pitch.get(pitch)
-    HeadMusic::Pitch.from_number_and_letter(pitch + semitones, pitch.letter_name.steps_up(number - 1))
+    pitch = HeadMusic::Rudiment::Pitch.get(pitch)
+    HeadMusic::Rudiment::Pitch.from_number_and_letter(pitch + semitones, pitch.letter_name.steps_up(number - 1))
   end
 
   def below(pitch)
-    pitch = HeadMusic::Pitch.get(pitch)
-    HeadMusic::Pitch.from_number_and_letter(pitch - semitones, pitch.letter_name.steps_down(number - 1))
+    pitch = HeadMusic::Rudiment::Pitch.get(pitch)
+    HeadMusic::Rudiment::Pitch.from_number_and_letter(pitch - semitones, pitch.letter_name.steps_down(number - 1))
   end
 
   def interval_class
@@ -128,7 +131,7 @@ class HeadMusic::DiatonicInterval
   alias_method :diatonic_generic_interval, :simple_steps
 
   def <=>(other)
-    other = self.class.get(other) unless other.is_a?(HeadMusic::DiatonicInterval)
+    other = self.class.get(other) unless other.is_a?(HeadMusic::Analysis::DiatonicInterval)
     semitones <=> other.semitones
   end
 
@@ -155,11 +158,11 @@ class HeadMusic::DiatonicInterval
   end
 
   def consonance_for_perfect(style = :standard_practice)
-    HeadMusic::Consonance.get(dissonant_fourth?(style) ? :dissonant : :perfect) if perfect?
+    HeadMusic::Rudiment::Consonance.get(dissonant_fourth?(style) ? :dissonant : :perfect) if perfect?
   end
 
   def consonance_for_major_and_minor
-    HeadMusic::Consonance.get((third_or_compound? || sixth_or_compound?) ? :imperfect : :dissonant) if major? || minor?
+    HeadMusic::Rudiment::Consonance.get((third_or_compound? || sixth_or_compound?) ? :imperfect : :dissonant) if major? || minor?
   end
 
   def dissonant_fourth?(style = :standard_practice)

data/lib/head_music/{harmonic_interval.rb → analysis/harmonic_interval.rb}

@@ -1,5 +1,8 @@
+# A module for musical analysis
+module HeadMusic::Analysis; end
+
 # A harmonic interval is the diatonic interval between two notes sounding together.
-class HeadMusic::HarmonicInterval
+class HeadMusic::Analysis::HarmonicInterval
   attr_reader :voice1, :voice2, :position
 
   def initialize(voice1, voice2, position)
@@ -9,7 +12,7 @@ class HeadMusic::HarmonicInterval
   end
 
   def diatonic_interval
-    @diatonic_interval ||= HeadMusic::DiatonicInterval.new(lower_pitch, upper_pitch)
+    @diatonic_interval ||= HeadMusic::Analysis::DiatonicInterval.new(lower_pitch, upper_pitch)
   end
 
   def voices

data/lib/head_music/{interval_cycle.rb → analysis/interval_cycle.rb}

@@ -1,20 +1,23 @@
+# A module for musical analysis
+module HeadMusic::Analysis; end
+
 # An Interval Cycle is a collection of pitch classes created from a sequence of the same interval class.
-class HeadMusic::IntervalCycle
+class HeadMusic::Analysis::IntervalCycle
   attr_reader :interval, :starting_pitch
 
   def self.get(interval = 7)
     @interval_cycles ||= {}
     interval = interval.to_s.gsub(/^C/i, "").to_i
-    interval = HeadMusic::ChromaticInterval.get(interval)
+    interval = HeadMusic::Rudiment::ChromaticInterval.get(interval)
     @interval_cycles[interval.to_i] ||= new(interval: interval, starting_pitch: "C4")
   end
 
   def initialize(interval:, starting_pitch: "C4")
-    @interval = interval if interval.is_a?(HeadMusic::DiatonicInterval)
-    @interval ||= interval if interval.is_a?(HeadMusic::ChromaticInterval)
-    @interval ||= HeadMusic::ChromaticInterval.get(interval) if interval.to_s.match?(/\d/)
-    @interval ||= HeadMusic::DiatonicInterval.get(interval)
-    @starting_pitch = HeadMusic::Pitch.get(starting_pitch)
+    @interval = interval if interval.is_a?(HeadMusic::Analysis::DiatonicInterval)
+    @interval ||= interval if interval.is_a?(HeadMusic::Rudiment::ChromaticInterval)
+    @interval ||= HeadMusic::Rudiment::ChromaticInterval.get(interval) if interval.to_s.match?(/\d/)
+    @interval ||= HeadMusic::Analysis::DiatonicInterval.get(interval)
+    @starting_pitch = HeadMusic::Rudiment::Pitch.get(starting_pitch)
   end
 
   def pitches
@@ -26,7 +29,7 @@ class HeadMusic::IntervalCycle
   end
 
   def pitch_class_set
-    @pitch_class_set ||= HeadMusic::PitchClassSet.new(pitches)
+    @pitch_class_set ||= HeadMusic::Analysis::PitchClassSet.new(pitches)
   end
 
   def spellings
@@ -48,6 +51,6 @@ class HeadMusic::IntervalCycle
   end
 
   def octave
-    @octave ||= HeadMusic::DiatonicInterval.get(:perfect_octave)
+    @octave ||= HeadMusic::Analysis::DiatonicInterval.get(:perfect_octave)
   end
 end

data/lib/head_music/{melodic_interval.rb → analysis/melodic_interval.rb}

@@ -1,5 +1,8 @@
+# A module for musical analysis
+module HeadMusic::Analysis; end
+
 # A melodic interval is the distance between one note and the next.
-class HeadMusic::MelodicInterval
+class HeadMusic::Analysis::MelodicInterval
   attr_reader :first_note, :second_note
 
   def initialize(note1, note2)
@@ -8,7 +11,7 @@ class HeadMusic::MelodicInterval
   end
 
   def diatonic_interval
-    @diatonic_interval ||= HeadMusic::DiatonicInterval.new(first_pitch, second_pitch)
+    @diatonic_interval ||= HeadMusic::Analysis::DiatonicInterval.new(first_pitch, second_pitch)
   end
 
   def position_start
@@ -56,7 +59,7 @@ class HeadMusic::MelodicInterval
   end
 
   def spans?(pitch)
-    pitch >= low_pitch && pitch <= high_pitch
+    pitch.between?(low_pitch, high_pitch)
   end
 
   def high_pitch
@@ -84,7 +87,7 @@ class HeadMusic::MelodicInterval
     combined_pitches = (pitches + other_interval.pitches).uniq
     return false if combined_pitches.length < 3
 
-    HeadMusic::PitchSet.new(combined_pitches).consonant_triad?
+    HeadMusic::Analysis::PitchSet.new(combined_pitches).consonant_triad?
   end
 
   def method_missing(method_name, *args, &block)

data/lib/head_music/{motion.rb → analysis/motion.rb}

@@ -1,5 +1,8 @@
+# A module for musical analysis
+module HeadMusic::Analysis; end
+
 # Motion defines the relative pitch direction of the upper and lower voices of subsequence intervals.
-class HeadMusic::Motion
+class HeadMusic::Analysis::Motion
   attr_reader :first_harmonic_interval, :second_harmonic_interval
 
   def initialize(first_harmonic_interval, second_harmonic_interval)
@@ -56,11 +59,11 @@ class HeadMusic::Motion
   private
 
   def upper_melodic_interval
-    HeadMusic::MelodicInterval.new(upper_notes.first, upper_notes.last)
+    HeadMusic::Analysis::MelodicInterval.new(upper_notes.first, upper_notes.last)
   end
 
   def lower_melodic_interval
-    HeadMusic::MelodicInterval.new(lower_notes.first, lower_notes.last)
+    HeadMusic::Analysis::MelodicInterval.new(lower_notes.first, lower_notes.last)
   end
 
   def upper_notes

data/lib/head_music/{pitch_class_set.rb → analysis/pitch_class_set.rb}

@@ -1,13 +1,16 @@
+# A module for musical analysis
+module HeadMusic::Analysis; end
+
 # A PitchClassSet represents a pitch-class set or pitch collection.
 # See also: PitchSet, PitchClass
-class HeadMusic::PitchClassSet
+class HeadMusic::Analysis::PitchClassSet
   attr_reader :pitch_classes
 
   delegate :empty?, to: :pitch_classes
   alias_method :empty_set?, :empty?
 
   def initialize(identifiers)
-    @pitch_classes = identifiers.map { |identifier| HeadMusic::PitchClass.get(identifier) }.uniq.sort
+    @pitch_classes = identifiers.map { |identifier| HeadMusic::Rudiment::PitchClass.get(identifier) }.uniq.sort
   end
 
   def to_s

data/lib/head_music/{pitch_set.rb → analysis/pitch_set.rb}

@@ -1,6 +1,9 @@
+# A module for musical analysis
+module HeadMusic::Analysis; end
+
 # A PitchSet is a collection of one or more pitches.
 # See also: PitchClassSet
-class HeadMusic::PitchSet
+class HeadMusic::Analysis::PitchSet
   TERTIAN_SONORITIES = {
     implied_triad: [3],
     triad: [3, 5],
@@ -20,7 +23,7 @@ class HeadMusic::PitchSet
   delegate :size, to: :pitch_class_set, prefix: true
 
   def initialize(pitches)
-    @pitches = pitches.map { |pitch| HeadMusic::Pitch.get(pitch) }.sort.uniq
+    @pitches = pitches.map { |pitch| HeadMusic::Rudiment::Pitch.get(pitch) }.sort.uniq
   end
 
   def pitch_classes
@@ -28,22 +31,22 @@ class HeadMusic::PitchSet
   end
 
   def pitch_class_set
-    @pitch_class_set ||= HeadMusic::PitchClassSet.new(pitch_classes)
+    @pitch_class_set ||= HeadMusic::Analysis::PitchClassSet.new(pitch_classes)
   end
 
   def reduction
-    @reduction ||= HeadMusic::PitchSet.new(reduction_pitches)
+    @reduction ||= HeadMusic::Analysis::PitchSet.new(reduction_pitches)
   end
 
   def diatonic_intervals
     @diatonic_intervals ||= pitches.each_cons(2).map do |pitch_pair|
-      HeadMusic::DiatonicInterval.new(*pitch_pair)
+      HeadMusic::Analysis::DiatonicInterval.new(*pitch_pair)
     end
   end
 
   def diatonic_intervals_above_bass_pitch
     @diatonic_intervals_above_bass_pitch ||= pitches_above_bass_pitch.map do |pitch|
-      HeadMusic::DiatonicInterval.new(bass_pitch, pitch)
+      HeadMusic::Analysis::DiatonicInterval.new(bass_pitch, pitch)
     end
   end
 
@@ -62,15 +65,15 @@ class HeadMusic::PitchSet
   end
 
   def invert
-    inverted_pitch = pitches[0] + HeadMusic::DiatonicInterval.get("perfect octave")
+    inverted_pitch = pitches[0] + HeadMusic::Analysis::DiatonicInterval.get("perfect octave")
     new_pitches = pitches.drop(1) + [inverted_pitch]
-    HeadMusic::PitchSet.new(new_pitches)
+    HeadMusic::Analysis::PitchSet.new(new_pitches)
   end
 
   def uninvert
-    inverted_pitch = pitches[-1] - HeadMusic::DiatonicInterval.get("perfect octave")
+    inverted_pitch = pitches[-1] - HeadMusic::Analysis::DiatonicInterval.get("perfect octave")
     new_pitches = [inverted_pitch] + pitches[0..-2]
-    HeadMusic::PitchSet.new(new_pitches)
+    HeadMusic::Analysis::PitchSet.new(new_pitches)
   end
 
   def bass_pitch
@@ -188,7 +191,7 @@ class HeadMusic::PitchSet
 
   def reduction_pitches
     pitches.map do |pitch|
-      pitch = HeadMusic::Pitch.fetch_or_create(pitch.spelling, pitch.register - 1) while pitch > bass_pitch + 12
+      pitch = HeadMusic::Rudiment::Pitch.fetch_or_create(pitch.spelling, pitch.register - 1) while pitch > bass_pitch + 12
       pitch
     end.sort
   end

data/lib/head_music/{sonority.rb → analysis/sonority.rb}

@@ -1,7 +1,10 @@
+# A module for musical analysis
+module HeadMusic::Analysis; end
+
 # A Sonority describes a set of pitch class intervalic relationships.
 # For example, a minor triad, or a major-minor seventh chord.
 # The Sonority class is a factory for returning one of its subclasses.
-class HeadMusic::Sonority
+class HeadMusic::Analysis::Sonority
   SONORITIES = {
     major_triad: %w[M3 P5],
     minor_triad: %w[m3 P5],
@@ -110,12 +113,12 @@ class HeadMusic::Sonority
     return nil unless identifier
 
     @diatonic_intervals_above_bass_pitch ||=
-      SONORITIES[identifier].map { |shorthand| HeadMusic::DiatonicInterval.get(shorthand) }
+      SONORITIES[identifier].map { |shorthand| HeadMusic::Analysis::DiatonicInterval.get(shorthand) }
   end
 
   def ==(other)
-    other = HeadMusic::PitchSet.new(other) if other.is_a?(Array)
-    other = self.class.new(other) if other.is_a?(HeadMusic::PitchSet)
+    other = HeadMusic::Analysis::PitchSet.new(other) if other.is_a?(Array)
+    other = self.class.new(other) if other.is_a?(HeadMusic::Analysis::PitchSet)
     identifier == other.identifier
   end
 end

data/lib/head_music/content/bar.rb

@@ -9,8 +9,8 @@ class HeadMusic::Content::Bar
 
   def initialize(composition, key_signature: nil, meter: nil)
     @composition = composition
-    @key_signature = HeadMusic::KeySignature.get(key_signature) if key_signature
-    @meter = HeadMusic::Meter.get(meter) if meter
+    @key_signature = HeadMusic::Rudiment::KeySignature.get(key_signature) if key_signature
+    @meter = HeadMusic::Rudiment::Meter.get(meter) if meter
   end
 
   def to_s

data/lib/head_music/content/composition.rb

@@ -65,9 +65,9 @@ class HeadMusic::Content::Composition
 
   def ensure_attributes(name, key_signature, meter)
     @name = name || "Composition"
-    @key_signature = HeadMusic::KeySignature.get(key_signature) if key_signature
-    @key_signature ||= HeadMusic::KeySignature.default
-    @meter = meter ? HeadMusic::Meter.get(meter) : HeadMusic::Meter.default
+    @key_signature = HeadMusic::Rudiment::KeySignature.get(key_signature) if key_signature
+    @key_signature ||= HeadMusic::Rudiment::KeySignature.default
+    @meter = meter ? HeadMusic::Rudiment::Meter.get(meter) : HeadMusic::Rudiment::Meter.default
   end
 
   def last_meter_change(bar_number)

data/lib/head_music/content/note.rb

@@ -10,7 +10,7 @@ class HeadMusic::Content::Note
   attr_accessor :pitch, :rhythmic_value, :voice, :position
 
   def initialize(pitch, rhythmic_value, voice = nil, position = nil)
-    @pitch = HeadMusic::Pitch.get(pitch)
+    @pitch = HeadMusic::Rudiment::Pitch.get(pitch)
     @rhythmic_value = HeadMusic::Content::RhythmicValue.get(rhythmic_value)
     @voice = voice || HeadMusic::Content::Voice.new
     @position = position || HeadMusic::Content::Position.new(@voice.composition, "1:1")

data/lib/head_music/content/placement.rb

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

data/lib/head_music/content/position.rb

@@ -53,7 +53,7 @@ class HeadMusic::Content::Position
   end
 
   def +(other)
-    other = HeadMusic::Content::RhythmicValue.new(other) if [HeadMusic::RhythmicUnit, Symbol, String].include?(other.class)
+    other = HeadMusic::Content::RhythmicValue.new(other) if [HeadMusic::Rudiment::RhythmicUnit, Symbol, String].include?(other.class)
     self.class.new(composition, bar_number, count, tick + other.ticks)
   end
 

data/lib/head_music/content/rhythmic_value.rb

@@ -12,7 +12,7 @@ class HeadMusic::Content::RhythmicValue
     case identifier
     when HeadMusic::Content::RhythmicValue
       identifier
-    when HeadMusic::RhythmicUnit
+    when HeadMusic::Rudiment::RhythmicUnit
       new(identifier)
     when Symbol, String
       identifier = identifier.to_s.downcase.strip.gsub(/\W+/, "_")
@@ -43,7 +43,7 @@ class HeadMusic::Content::RhythmicValue
   end
 
   def initialize(unit, dots: nil, tied_value: nil)
-    @unit = HeadMusic::RhythmicUnit.get(unit)
+    @unit = HeadMusic::Rudiment::RhythmicUnit.get(unit)
     @dots = [0, 1, 2, 3].include?(dots) ? dots : 0
     @tied_value = tied_value
   end
@@ -65,7 +65,7 @@ class HeadMusic::Content::RhythmicValue
   end
 
   def ticks
-    HeadMusic::Rhythm::PPQN * 4 * total_value
+    HeadMusic::Rudiment::Rhythm::PPQN * 4 * total_value
   end
 
   def per_whole

data/lib/head_music/{staff.rb → content/staff.rb}

@@ -1,13 +1,16 @@
+# A module for musical content
+module HeadMusic::Content; end
+
 # A staff is a set of lines and spaces that provides context for a pitch
-class HeadMusic::Staff
+class HeadMusic::Content::Staff
   DEFAULT_LINE_COUNT = 5
 
   attr_reader :default_clef, :line_count, :instrument
 
   def initialize(default_clef_key, instrument: nil, line_count: nil)
-    @default_clef = HeadMusic::Clef.get(default_clef_key)
+    @default_clef = HeadMusic::Rudiment::Clef.get(default_clef_key)
     @line_count = line_count || DEFAULT_LINE_COUNT
-    @instrument = HeadMusic::Instrument.get(instrument) if instrument
+    @instrument = HeadMusic::Instruments::Instrument.get(instrument) if instrument
   end
 
   def clef

data/lib/head_music/content/voice.rb

@@ -56,12 +56,12 @@ class HeadMusic::Content::Voice
   end
 
   def range
-    HeadMusic::DiatonicInterval.new(lowest_pitch, highest_pitch)
+    HeadMusic::Analysis::DiatonicInterval.new(lowest_pitch, highest_pitch)
   end
 
   def melodic_intervals
     @melodic_intervals ||=
-      notes.each_cons(2).map { |note_pair| HeadMusic::MelodicInterval.new(*note_pair) }
+      notes.each_cons(2).map { |note_pair| HeadMusic::Analysis::MelodicInterval.new(*note_pair) }
   end
 
   def leaps