head_music 7.0.4 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2179abb1bb9bb68a8b73e1847a6b715a37902b8601b1fad1f42729e4a7485c4b
-  data.tar.gz: 6e9eb38f55e86b7f87a9f6ce0e4b720afadcb5e3d90a95254ef9bb3685cd428b
+  metadata.gz: 1693c61699c2fdcf64441f532c205b8be2e3b6b2be47e772c2471d671b7712b3
+  data.tar.gz: 1c819eee801f19b38cfbb6bdc51177c2e885aced316ea55034bb6c99a75183c5
 SHA512:
-  metadata.gz: 0ba286e7a630413151bd63100a6b0bcb8d9d3adba5e81a3af47c3774724e18c5f78a4330f2811c1068c9a2d8b5a7c4215d27a5793491016ecd61f2660c7755f6
-  data.tar.gz: d5b916629846e13983fd80794492bb051a0c42139e39b6584c61b21e5a504e7de8e5663f8f931f566c4cd269bef271fd10ac682d1a1bcace6ab37f310101cfce
+  metadata.gz: ced29a767bab571ee4c77a14d6c108510465c8424ee66249cd3343efbceb3bec2dec8e94664a2b260a4a0716ae51948c3b796ff088d0b3aab07d40ac762ec111
+  data.tar.gz: 6e7bf970c65500799fa0788f468885207f531c7a8de5c6f1f6be27952435994616f7dc1f10bf1ad51a233244a47d43eca553d9d73add30e8ca89afafac300d9b

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/{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/{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
@@ -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::Rudiment::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/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

data/lib/head_music/{instrument.rb → instruments/instrument.rb}

@@ -1,3 +1,6 @@
+# Namespace for instrument definitions, categorization, and configuration
+module HeadMusic::Instruments; end
+
 # A musical instrument.
 # An instrument object can be assigned to a staff object.
 # Attributes:
@@ -14,17 +17,17 @@
 # Associations:
 #   family: the family of the instrument (e.g. "saxophone")
 #   orchestra_section: the section of the orchestra (e.g. "strings")
-class HeadMusic::Instrument
+class HeadMusic::Instruments::Instrument
   include HeadMusic::Named
 
-  INSTRUMENTS = YAML.load_file(File.expand_path("data/instruments.yml", __dir__)).freeze
+  INSTRUMENTS = YAML.load_file(File.expand_path("instruments.yml", __dir__)).freeze
 
   def self.get(name)
     get_by_name(name)
   end
 
   def self.all
-    HeadMusic::InstrumentFamily.all
+    HeadMusic::Instruments::InstrumentFamily.all
     @all ||=
       INSTRUMENTS.map { |key, _data| get(key) }.sort_by { |instrument| instrument.name.downcase }
   end
@@ -48,7 +51,7 @@ class HeadMusic::Instrument
   def family
     return unless family_key
 
-    HeadMusic::InstrumentFamily.get(family_key)
+    HeadMusic::Instruments::InstrumentFamily.get(family_key)
   end
 
   # Returns true if the instrument sounds at a different pitch than written.
@@ -70,7 +73,7 @@ class HeadMusic::Instrument
   end
 
   def pitched?
-    return false if default_clefs.compact.uniq == [HeadMusic::Clef.get("neutral_clef")]
+    return false if default_clefs.compact.uniq == [HeadMusic::Rudiment::Clef.get("neutral_clef")]
 
     default_clefs.any?
   end
@@ -139,7 +142,7 @@ class HeadMusic::Instrument
 
   def initialize_family(record)
     @family_key = record["family_key"]
-    @family = HeadMusic::InstrumentFamily.get(family_key)
+    @family = HeadMusic::Instruments::InstrumentFamily.get(family_key)
   end
 
   def inherit_family_attributes(record)
@@ -160,7 +163,7 @@ class HeadMusic::Instrument
     @classification_keys = [@classification_keys, record["classification_keys"]].flatten.compact.uniq
     @variants =
       (record["variants"] || {}).map do |key, attributes|
-        HeadMusic::Instrument::Variant.new(key, attributes)
+        HeadMusic::Instruments::Variant.new(key, attributes)
       end
   end
 

data/lib/head_music/{data → instruments}/instrument_families.yml

@@ -47,7 +47,12 @@ cymbal:
   classification_keys:
     - percussion
     - idiophone
+    - unpitched
   orchestra_section_key: percussion
+didgeridoo:
+  classification_keys:
+    - aerophone
+    - wind
 double_bass:
   classification_keys:
     - bowed
@@ -69,11 +74,13 @@ glockenspiel:
     - struck
     - metal
     - mallet
+    - pitched
   orchestra_section_key: percussion
 gong:
   classification_keys:
     - percussion
     - idiophone
+    - unpitched
   orchestra_section_key: percussion
 guitar:
   classification_keys:
@@ -81,6 +88,13 @@ guitar:
     - plucked
     - string
   orchestra_section_key: string
+harmonica:
+  classification_keys:
+    - reed
+    - free-reed
+    - aerophone
+    - wind
+  orchestra_section_key: woodwind
 harp:
   classification_keys:
     - chordophone
@@ -104,6 +118,7 @@ kettledrum:
   classification_keys:
     - percussion
     - membranophone
+    - pitched
   orchestra_section_key: percussion
 lute:
   classification_keys:
@@ -125,6 +140,7 @@ marimba:
     - struck
     - wood
     - mallet
+    - pitched
   orchestra_section_key: percussion
 oboe:
   classification_keys:
@@ -166,16 +182,40 @@ saxophone:
     - wind
     - woodwind
   orchestra_section_key: woodwind
+sitar:
+  classification_keys:
+    - chordophone
+    - plucked
+    - string
+  orchestra_section_key: string
 snare_drum:
   classification_keys:
     - percussion
     - membranophone
+    - unpitched
+  orchestra_section_key: percussion
+steelpan:
+  classification_keys:
+    - percussion
+    - idiophone
+    - struck
+    - metal
+    - pitched
   orchestra_section_key: percussion
 synthesizer:
   classification_keys:
     - electronic
     - keyboard
   orchestra_section_key: keyboard
+tabla:
+  classification_keys:
+    - percussion
+    - membranophone
+    - pitched
+  orchestra_section_key: percussion
+theremin:
+  classification_keys:
+    - electronic
 trombone:
   classification_keys:
     - aerophone
@@ -194,6 +234,12 @@ tuba:
     - brass
     - wind
   orchestra_section_key: brass
+ukulele:
+  classification_keys:
+    - chordophone
+    - plucked
+    - string
+  orchestra_section_key: string
 vibraphone:
   classification_keys:
     - percussion
@@ -202,6 +248,7 @@ vibraphone:
     - keyboard
     - mallet
     - metal
+    - pitched
   orchestra_section_key: percussion
 violin:
   classification_keys:
@@ -218,6 +265,7 @@ woodblock:
     - percussion
     - struck
     - idiophone
+    - unpitched
   orchestra_section_key: percussion
 xylophone:
   classification_keys:
@@ -227,4 +275,5 @@ xylophone:
     - keyboard
     - mallet
     - wood
+    - pitched
   orchestra_section_key: percussion

data/lib/head_music/{instrument_family.rb → instruments/instrument_family.rb}

@@ -1,12 +1,15 @@
+# Namespace for instrument definitions, categorization, and configuration
+module HeadMusic::Instruments; end
+
 # An *InstrumentFamily* is a species of instrument
 # that may exist in a variety of keys or other variations.
 # For example, _saxophone_ is an instrument family, while
 # _alto saxophone_ and _baritone saxophone_ are specific instruments.
-class HeadMusic::InstrumentFamily
+class HeadMusic::Instruments::InstrumentFamily
   include HeadMusic::Named
 
   INSTRUMENT_FAMILIES =
-    YAML.load_file(File.expand_path("data/instrument_families.yml", __dir__)).freeze
+    YAML.load_file(File.expand_path("instrument_families.yml", __dir__)).freeze
 
   attr_reader :name_key, :classification_keys, :orchestra_section_key
   attr_accessor :name