head_music 7.0.5 → 8.0.0

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

@@ -458,6 +458,13 @@ cymbal:
       staff_schemes:
         default:
           - clef: neutral_clef
+didgeridoo:
+  family_key: didgeridoo
+  variants:
+    default:
+      staff_schemes:
+        default:
+          - clef: neutral_clef
 double_bass:
   alias_name_keys:
     - contrabass
@@ -561,6 +568,15 @@ hammered_dulcimer:
         default:
           - clef: treble_clef
   orchestra_section_key: percussion
+harmonica:
+  alias_name_keys:
+    - mouth_organ
+  family_key: harmonica
+  variants:
+    default:
+      staff_schemes:
+        default:
+          - clef: treble_clef
 harp:
   family_key: harp
   variants:
@@ -963,6 +979,13 @@ subcontrabass_saxophone:
             sounding_transposition: -38
   range_categories:
     - subcontrabass
+sitar:
+  family_key: sitar
+  variants:
+    default:
+      staff_schemes:
+        default:
+          - clef: treble_clef
 snare_drum:
   alias_name_keys:
     - side_drum
@@ -997,6 +1020,15 @@ sousaphone:
             sounding_transposition: 0
   range_categories:
     - bass
+steelpan:
+  alias_name_keys:
+    - steel_drum
+  family_key: steelpan
+  variants:
+    default:
+      staff_schemes:
+        default:
+          - clef: treble_clef
 suspended_cymbal:
   family_key: cymbal
   variants:
@@ -1005,6 +1037,8 @@ suspended_cymbal:
         default:
           - clef: neutral_clef
 synthesizer:
+  alias_name_keys:
+    - electronic_keyboard
   family_key: synthesizer
   variants:
     default:
@@ -1014,6 +1048,13 @@ synthesizer:
             name_key: right_hand
           - clef: bass_clef
             name_key: left_hand
+tabla:
+  family_key: tabla
+  variants:
+    default:
+      staff_schemes:
+        default:
+          - clef: neutral_clef
 tam_tam:
   alias_name_keys:
     - gong
@@ -1069,6 +1110,13 @@ tenor_voice:
             sounding_transposition: -12
   range_categories:
     - tenor
+theremin:
+  family_key: theremin
+  variants:
+    default:
+      staff_schemes:
+        default:
+          - clef: treble_clef
 timpani:
   alias_name_keys:
     - kettledrum
@@ -1148,6 +1196,74 @@ tuba:
       staff_schemes:
         default:
           - clef: bass_clef
+ukulele:
+  alias_name_keys:
+    - soprano_ukulele
+  family_key: ukulele
+  variants:
+    default:
+      staff_schemes:
+        default:
+          - clef: treble_clef
+  range_categories:
+    - soprano
+    - alto
+pocket_ukulele:
+  alias_name_keys:
+    - sopranino_ukulele
+    - piccolo_ukulele
+  family_key: ukulele
+  variants:
+    default:
+      staff_schemes:
+        default:
+          - clef: treble_clef
+  range_categories:
+    - sopranino
+    - soprano
+concert_ukulele:
+  alias_name_keys:
+    - alto_ukulele
+  family_key: ukulele
+  variants:
+    default:
+      staff_schemes:
+        default:
+          - clef: treble_clef
+  range_categories:
+    - soprano
+    - alto
+tenor_ukulele:
+  family_key: ukulele
+  variants:
+    default:
+      staff_schemes:
+        default:
+          - clef: treble_clef
+  range_categories:
+    - tenor
+baritone_ukulele:
+  family_key: ukulele
+  variants:
+    default:
+      staff_schemes:
+        default:
+          - clef: treble_clef
+  range_categories:
+    - alto
+    - tenor
+    - baritone
+bass_ukulele:
+  family_key: ukulele
+  variants:
+    default:
+      staff_schemes:
+        default:
+          - clef: bass_clef
+  range_categories:
+    - bass
+    - baritone
+    - tenor
 vibraphone:
   alias_name_keys:
     - vibes

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

@@ -1,4 +1,7 @@
-class HeadMusic::Instrument::Staff
+# Namespace for instrument definitions, categorization, and configuration
+module HeadMusic::Instruments; end
+
+class HeadMusic::Instruments::Staff
   DEFAULT_CLEF = "treble_clef"
 
   attr_reader :staff_scheme, :attributes
@@ -9,7 +12,7 @@ class HeadMusic::Instrument::Staff
   end
 
   def clef
-    HeadMusic::Clef.get(smart_clef_key)
+    HeadMusic::Rudiment::Clef.get(smart_clef_key)
   end
 
   def smart_clef_key

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

@@ -1,4 +1,9 @@
-class HeadMusic::Instrument::StaffScheme
+require_relative "staff"
+
+# Namespace for instrument definitions, categorization, and configuration
+module HeadMusic::Instruments; end
+
+class HeadMusic::Instruments::StaffScheme
   attr_reader :variant, :key, :list
 
   def initialize(variant:, key:, list:)
@@ -13,7 +18,7 @@ class HeadMusic::Instrument::StaffScheme
 
   def staves
     @staves ||= list.map do |attributes|
-      HeadMusic::Instrument::Staff.new(self, attributes)
+      HeadMusic::Instruments::Staff.new(self, attributes)
     end
   end
 end

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

@@ -1,4 +1,7 @@
-class HeadMusic::Instrument::Variant
+# Namespace for instrument definitions, categorization, and configuration
+module HeadMusic::Instruments; end
+
+class HeadMusic::Instruments::Variant
   attr_reader :key, :attributes
 
   def initialize(key, attributes = {})
@@ -10,13 +13,13 @@ class HeadMusic::Instrument::Variant
     return unless attributes["pitch_designation"].to_s != ""
 
     @pitch_designation ||=
-      HeadMusic::Spelling.get(attributes["pitch_designation"])
+      HeadMusic::Rudiment::Spelling.get(attributes["pitch_designation"])
   end
 
   def staff_schemes
     @staff_schemes ||=
       (attributes["staff_schemes"] || {}).map do |key, list|
-        HeadMusic::Instrument::StaffScheme.new(
+        HeadMusic::Instruments::StaffScheme.new(
           key: key,
           variant: self,
           list: list

data/lib/head_music/locales/en.yml

@@ -86,6 +86,7 @@ en:
       mezzo_soprano_voice: mezzo-soprano
       percussion: percussion
       percussion_instrument: percussion instrument
+      pitched: pitched
       plucked: plucked
       plucked_instrument: plucked instrument
       reed: reed
@@ -95,6 +96,7 @@ en:
       stringed_instrument: stringed instrument
       strings: strings
       struck: struck
+      unpitched: unpitched
       voice: voice
       wind: wind
       wind_instrument: wind instrument
@@ -119,6 +121,7 @@ en:
       alto_flute: alto flute
       alto_recorder: alto recorder
       alto_saxophone: alto saxophone
+      alto_ukulele: alto ukulele
       alto_voice: alto
       arpeggione: arpeggione
       bagpipe: bagpipe
@@ -126,6 +129,7 @@ en:
       baritone_horn: baritone horn
       baritone_oboe: baritone oboe
       baritone_saxophone: baritone saxophone
+      baritone_ukulele: baritone ukulele
       baritone_voice: baritone
       bass: bass
       bass_clarinet: bass clarinet
@@ -137,6 +141,7 @@ en:
       bass_trombone: bass trombone
       bass_trumpet: bass trumpet
       bass_tuba: bass tuba
+      bass_ukulele: bass ukulele
       bass_voice: bass
       basset_horn: basset horn
       basset_recorder: basset recorder
@@ -154,6 +159,7 @@ en:
       clavichord: clavichord
       concert_bells: concert bells
       concert_cymbals: concert cymbals
+      concert_ukulele: concert ukulele
       contra_great_bass_recorder: contra-great bass recorder
       contrabass: contrabass
       contrabass_clarinet: contrabass clarinet
@@ -171,8 +177,10 @@ en:
       crotales: crotales
       cymbal: cymbal
       descant: descant
+      didgeridoo: didgeridoo
       double_bass: double bass
       double_contrabass_recorder: double-contrabass recorder
+      electronic_keyboard: electronic keyboard
       english_horn: English horn
       euphonium: euphonium
       fiddle: fiddle
@@ -188,6 +196,7 @@ en:
       great_highland_bagpipe: great highland bagpipe
       guitar: guitar
       hammered_dulcimer: hammered dulcimer
+      harmonica: harmonica
       harp: harp
       harpsichord: harpsichord
       hautbois_d_amour: hautbois d'amour
@@ -204,6 +213,7 @@ en:
       mezzo_soprano: mezzo-soprano
       mezzo_soprano_voice: mezzo-soprano
       military_drum: military drum
+      mouth_organ: mouth_organ
       natural_horn: natural horn
       oboe: oboe
       oboe_d_amore: oboe d'amore
@@ -219,25 +229,33 @@ en:
       piccolo_recorder: piccolo recorder
       piccolo_saxophone: piccolo saxophone
       piccolo_trumpet: piccolo trumpet
+      piccolo_ukulele: piccolo ukulele
       pipe_organ: pipe organ
+      pocket_trumpet: pocket trumpet
+      pocket_ukulele: pocket ukulele
       quart_bass_recorder: quart bass recorder
       recorder: recorder
       ride_cymbal: ride cymbal
       saxophone: saxophone
       side_drum: side drum
+      sitar: sitar
       snare_drum: snare drum
       sopranino_clarinet: sopranino clarinet
       sopranino_recorder: sopranino recorder
       sopranino_saxophone: sopranino saxophone
+      sopranino_ukulele: sopranino ukulele
       sopranissimo_recorder: sopranissimo recorder
       sopranissimo_saxophone: sopranissimo saxophone
       soprano: soprano
       soprano_clarinet: soprano clarinet
       soprano_recorder: soprano recorder
       soprano_saxophone: soprano saxophone
+      soprano_ukulele: soprano ukulele
       soprano_voice: soprano
       soprillo: soprillo
       sousaphone: sousaphone
+      steelpan: steelpan
+      steel_drum: steel drum
       string_bass: string bass
       sub_bass_recorder: sub-bass recorder
       sub_contrabass_recorder: sub-contrabass recorder
@@ -245,6 +263,7 @@ en:
       subcontrabass_saxophone: subcontrabass saxophone
       suspended_cymbal: suspended cymbal
       synthesizer: synthesizer
+      tabla: tabla
       tabor: tabor
       tam_tam: tam-tam
       tambourine: tambourine
@@ -255,7 +274,9 @@ en:
       tenor_saxophone: tenor saxophone
       tenor_trombone: tenor trombone
       tenor_tuba: tenor tuba
+      tenor_ukulele: tenor ukulele
       tenor_voice: tenor
+      theremin: theremin
       timpani: timpani
       timpanum: timpanum
       tom_drum: tom drum
@@ -266,6 +287,7 @@ en:
       trumpet: trumpet
       tuba: tuba
       tubular_bells: tubular bells
+      ukulele: ukulele
       vibes: vibes
       vibraphone: vibraphone
       viola: viola

data/lib/head_music/{alteration.rb → rudiment/alteration.rb}

@@ -1,8 +1,11 @@
-require "head_music/musical_symbol"
+require "head_music/rudiment/musical_symbol"
 
-# A Alteration is a symbol that modifies pitch, such as a sharp, flat, or natural.
+# A module for music rudiments
+module HeadMusic::Rudiment; end
+
+# An Alteration is a symbol that modifies pitch, such as a sharp, flat, or natural.
 # In French, sharps and flats in the key signature are called "altérations".
-class HeadMusic::Alteration
+class HeadMusic::Rudiment::Alteration
   include Comparable
 
   attr_reader :identifier, :cents, :musical_symbols
@@ -51,7 +54,7 @@ class HeadMusic::Alteration
   end
 
   def self.get(identifier)
-    return identifier if identifier.is_a?(HeadMusic::Alteration)
+    return identifier if identifier.is_a?(HeadMusic::Rudiment::Alteration)
 
     all.detect do |alteration|
       alteration.representions.include?(identifier)
@@ -86,7 +89,7 @@ class HeadMusic::Alteration
   end
 
   def <=>(other)
-    other = HeadMusic::Alteration.get(other)
+    other = HeadMusic::Rudiment::Alteration.get(other)
     cents <=> other.cents
   end
 
@@ -104,7 +107,7 @@ class HeadMusic::Alteration
 
   def initialize_musical_symbols(list)
     @musical_symbols = (list || []).map do |record|
-      HeadMusic::MusicalSymbol.new(
+      HeadMusic::Rudiment::MusicalSymbol.new(
         unicode: record[:unicode],
         ascii: record[:ascii],
         html_entity: record[:html_entity]

data/lib/head_music/{chromatic_interval.rb → rudiment/chromatic_interval.rb}

@@ -1,5 +1,8 @@
+# A module for music rudiments
+module HeadMusic::Rudiment; end
+
 # A chromatic interval is the distance between two pitches measured in half-steps.
-class HeadMusic::ChromaticInterval
+class HeadMusic::Rudiment::ChromaticInterval
   include Comparable
   include HeadMusic::Named
 
@@ -37,7 +40,7 @@ class HeadMusic::ChromaticInterval
   end
 
   def simple
-    HeadMusic::ChromaticInterval.get(semitones % 12)
+    HeadMusic::Rudiment::ChromaticInterval.get(semitones % 12)
   end
 
   def simple?
@@ -60,11 +63,11 @@ class HeadMusic::ChromaticInterval
   alias_method :specific_interval, :semitones
 
   def +(other)
-    HeadMusic::ChromaticInterval.get(to_i + other.to_i)
+    HeadMusic::Rudiment::ChromaticInterval.get(to_i + other.to_i)
   end
 
   def -(other)
-    HeadMusic::ChromaticInterval.get((to_i - other.to_i).abs)
+    HeadMusic::Rudiment::ChromaticInterval.get((to_i - other.to_i).abs)
   end
 
   def <=>(other)

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

@@ -1,7 +1,10 @@
-require "head_music/interval_cycle"
+require "head_music/rudiment/interval_cycle"
+
+# A module for music rudiments
+module HeadMusic::Rudiment; end
 
 # A Circle of Fifths or Fourths shows relationships between pitch classes
-class HeadMusic::Circle < HeadMusic::IntervalCycle
+class HeadMusic::Rudiment::Circle < HeadMusic::Rudiment::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/{clef.rb → rudiment/clef.rb}

@@ -1,10 +1,13 @@
 require "yaml"
 
+# A module for music rudiments
+module HeadMusic::Rudiment; end
+
 # A clef assigns pitches to the lines and spaces of a staff.
-class HeadMusic::Clef
+class HeadMusic::Rudiment::Clef
   include HeadMusic::Named
 
-  RECORDS = YAML.load_file(File.expand_path("data/clefs.yml", __dir__)).freeze
+  RECORDS = YAML.load_file(File.expand_path("clefs.yml", __dir__)).freeze
 
   def self.get(name)
     get_by_name(name)
@@ -82,7 +85,7 @@ class HeadMusic::Clef
 
   def initialize_data_from_record(record)
     initialize_keys_from_record(record)
-    @pitch = HeadMusic::Pitch.get(record[:pitch])
+    @pitch = HeadMusic::Rudiment::Pitch.get(record[:pitch])
     @line = record[:line]
     @modern = record[:modern]
     initialize_musical_symbols(record[:symbols])
@@ -95,7 +98,7 @@ class HeadMusic::Clef
 
   def initialize_musical_symbols(list)
     @musical_symbols = (list || []).map do |symbol_data|
-      HeadMusic::MusicalSymbol.new(**symbol_data.slice(:ascii, :html_entity, :unicode))
+      HeadMusic::Rudiment::MusicalSymbol.new(**symbol_data.slice(:ascii, :html_entity, :unicode))
     end
   end
 end

data/lib/head_music/{consonance.rb → rudiment/consonance.rb}

@@ -1,5 +1,8 @@
+# A module for music rudiments
+module HeadMusic::Rudiment; end
+
 # Consonance describes a category or degree of harmonic pleasantness: perfect, imperfect, or dissonant
-class HeadMusic::Consonance
+class HeadMusic::Rudiment::Consonance
   LEVELS = %w[perfect imperfect dissonant].freeze
 
   def self.get(name)

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

@@ -1,20 +1,23 @@
+# A module for music rudiments
+module HeadMusic::Rudiment; end
+
 # An Interval Cycle is a collection of pitch classes created from a sequence of the same interval class.
-class HeadMusic::IntervalCycle
+class HeadMusic::Rudiment::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::Rudiment::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/{key_signature → rudiment/key_signature}/enharmonic_equivalence.rb

@@ -1,19 +1,19 @@
 # Key signatures are enharmonic when all pitch classes in one are respellings of the pitch classes in the other.
-class HeadMusic::KeySignature::EnharmonicEquivalence
+class HeadMusic::Rudiment::KeySignature::EnharmonicEquivalence
   attr_reader :key_signature
 
   def self.get(key_signature)
-    key_signature = HeadMusic::KeySignature.get(key_signature)
+    key_signature = HeadMusic::Rudiment::KeySignature.get(key_signature)
     @enharmonic_equivalences ||= {}
     @enharmonic_equivalences[key_signature.to_s] ||= new(key_signature)
   end
 
   def initialize(key_signature)
-    @key_signature = HeadMusic::KeySignature.get(key_signature)
+    @key_signature = HeadMusic::Rudiment::KeySignature.get(key_signature)
   end
 
   def enharmonic_equivalent?(other)
-    other = HeadMusic::KeySignature.get(other)
+    other = HeadMusic::Rudiment::KeySignature.get(other)
 
     key_signature.pitch_classes.map(&:to_i).sort == other.pitch_classes.map(&:to_i).sort &&
       key_signature.alterations.map(&:to_s).sort != other.alterations.map(&:to_s).sort

data/lib/head_music/{key_signature.rb → rudiment/key_signature.rb}

@@ -1,5 +1,8 @@
+# A module for music rudiments
+module HeadMusic::Rudiment; end
+
 # Represents a key signature.
-class HeadMusic::KeySignature
+class HeadMusic::Rudiment::KeySignature
   attr_reader :tonic_spelling, :scale_type, :scale
 
   ORDERED_LETTER_NAMES_OF_SHARPS = %w[F C G D A E B].freeze
@@ -10,7 +13,7 @@ class HeadMusic::KeySignature
   end
 
   def self.get(identifier)
-    return identifier if identifier.is_a?(HeadMusic::KeySignature)
+    return identifier if identifier.is_a?(HeadMusic::Rudiment::KeySignature)
 
     @key_signatures ||= {}
     tonic_spelling, scale_type_name = identifier.strip.split(/\s/)
@@ -23,11 +26,11 @@ class HeadMusic::KeySignature
   delegate :pitches, :pitch_classes, to: :scale
 
   def initialize(tonic_spelling, scale_type = nil)
-    @tonic_spelling = HeadMusic::Spelling.get(tonic_spelling)
-    @scale_type = HeadMusic::ScaleType.get(scale_type) if scale_type
-    @scale_type ||= HeadMusic::ScaleType.default
+    @tonic_spelling = HeadMusic::Rudiment::Spelling.get(tonic_spelling)
+    @scale_type = HeadMusic::Rudiment::ScaleType.get(scale_type) if scale_type
+    @scale_type ||= HeadMusic::Rudiment::ScaleType.default
     @scale_type = @scale_type.parent || @scale_type
-    @scale = HeadMusic::Scale.get(@tonic_spelling, @scale_type)
+    @scale = HeadMusic::Rudiment::Scale.get(@tonic_spelling, @scale_type)
   end
 
   def spellings
@@ -102,6 +105,6 @@ class HeadMusic::KeySignature
   private
 
   def enharmonic_equivalence
-    @enharmonic_equivalence ||= HeadMusic::KeySignature::EnharmonicEquivalence.get(self)
+    @enharmonic_equivalence ||= HeadMusic::Rudiment::KeySignature::EnharmonicEquivalence.get(self)
   end
 end

data/lib/head_music/{letter_name.rb → rudiment/letter_name.rb}

@@ -1,5 +1,8 @@
+# A module for music rudiments
+module HeadMusic::Rudiment; end
+
 # Music has seven lette names that are used to identify pitches and pitch classes.
-class HeadMusic::LetterName
+class HeadMusic::Rudiment::LetterName
   NAMES = %w[C D E F G A B].freeze
 
   NATURAL_PITCH_CLASS_NUMBERS = {
@@ -32,7 +35,7 @@ class HeadMusic::LetterName
 
     pitch_class = pitch_class.to_i % 12
     name = NAMES.detect { |candidate| pitch_class == NATURAL_PITCH_CLASS_NUMBERS[candidate] }
-    name ||= HeadMusic::PitchClass::SHARP_SPELLINGS[pitch_class].first
+    name ||= HeadMusic::Rudiment::PitchClass::SHARP_SPELLINGS[pitch_class].first
     @letter_names[name] ||= new(name) if NAMES.include?(name)
   end
 
@@ -47,7 +50,7 @@ class HeadMusic::LetterName
   end
 
   def pitch_class
-    HeadMusic::PitchClass.get(NATURAL_PITCH_CLASS_NUMBERS[name])
+    HeadMusic::Rudiment::PitchClass.get(NATURAL_PITCH_CLASS_NUMBERS[name])
   end
 
   def ==(other)
@@ -59,15 +62,15 @@ class HeadMusic::LetterName
   end
 
   def steps_up(num)
-    HeadMusic::LetterName.get(series_ascending[num % NAMES.length])
+    HeadMusic::Rudiment::LetterName.get(series_ascending[num % NAMES.length])
   end
 
   def steps_down(num)
-    HeadMusic::LetterName.get(series_descending[num % NAMES.length])
+    HeadMusic::Rudiment::LetterName.get(series_descending[num % NAMES.length])
   end
 
   def steps_to(other, direction = :ascending)
-    other = HeadMusic::LetterName.get(other)
+    other = HeadMusic::Rudiment::LetterName.get(other)
     other_position = other.position
     if direction == :descending
       other_position -= NAMES.length if other_position > position