head_music 6.0.1 → 7.0.0

data/lib/head_music/diatonic_interval/category.rb

@@ -0,0 +1,24 @@
+# Accepts the letter name count between two notes and categorizes the interval
+class HeadMusic::DiatonicInterval::Category
+  attr_reader :number
+
+  def initialize(number)
+    @number = number
+  end
+
+  def step?
+    number == 2
+  end
+
+  def skip?
+    number == 3
+  end
+
+  def leap?
+    number >= 3
+  end
+
+  def large_leap?
+    number > 3
+  end
+end

data/lib/head_music/diatonic_interval/naming.rb

@@ -0,0 +1,73 @@
+# 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
+
+  attr_reader :number, :semitones
+
+  def initialize(number:, semitones:)
+    @number = number
+    @semitones = semitones
+  end
+
+  def simple_number
+    @simple_number ||= octave_equivalent? ? 8 : (number - 1) % 7 + 1
+  end
+
+  def simple_name
+    [quality_name, simple_number_name].join(" ")
+  end
+
+  def quality_name
+    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)
+  end
+
+  def simple_number_name
+    NUMBER_NAMES[simple_number - 1]
+  end
+
+  def number_name
+    NUMBER_NAMES[number - 1] || (number.to_s + NAME_SUFFIXES[number % 10])
+  end
+
+  def name
+    if named_number?
+      [quality_name, number_name].join(" ")
+    elsif simple_name == "perfect octave"
+      "#{octaves.humanize} octaves"
+    else
+      "#{octaves.humanize} octaves and #{quality.article} #{simple_name}"
+    end
+  end
+
+  def shorthand
+    step_shorthand = (number == 1) ? "U" : number
+    [quality.shorthand, step_shorthand].join
+  end
+
+  private
+
+  def simple_semitones
+    @simple_semitones ||= semitones % 12
+  end
+
+  def named_number?
+    number < NUMBER_NAMES.length
+  end
+
+  def quality
+    @quality ||= HeadMusic::Quality.get(quality_name)
+  end
+
+  def octaves
+    @octaves ||= semitones / 12
+  end
+
+  def octave_equivalent?
+    number > 1 && ((number - 1) % 7).zero?
+  end
+end

data/lib/head_music/diatonic_interval/parser.rb

@@ -0,0 +1,47 @@
+class HeadMusic::DiatonicInterval::Parser
+  NUMBER_NAMES = HeadMusic::DiatonicInterval::NUMBER_NAMES
+
+  attr_reader :identifier
+
+  def initialize(identifier)
+    @identifier = expand(identifier)
+  end
+
+  def words
+    identifier.to_s.split(/[_ ]+/)
+  end
+
+  def quality_name
+    words[0..-2].join(" ").to_sym
+  end
+
+  def degree_name
+    words.last
+  end
+
+  def steps
+    NUMBER_NAMES.index(degree_name)
+  end
+
+  def higher_letter
+    HeadMusic::Pitch.middle_c.letter_name.steps_up(steps)
+  end
+
+  def expand(identifier)
+    if /[A-Z]\d{1,2}/i.match?(identifier)
+      number = NUMBER_NAMES[identifier.gsub(/[A-Z]/i, "").to_i - 1]
+      return [quality_for(identifier[0]), number].join("_").to_sym
+    end
+    identifier
+  end
+
+  def quality_abbreviations
+    HeadMusic::DiatonicInterval::QUALITY_ABBREVIATIONS
+  end
+
+  def quality_for(abbreviation)
+    quality_abbreviations[abbreviation.to_sym] ||
+      quality_abbreviations[abbreviation.upcase.to_sym] ||
+      quality_abbreviations[abbreviation.downcase.to_sym]
+  end
+end

data/lib/head_music/diatonic_interval/semitones.rb

@@ -0,0 +1,36 @@
+# Accepts a name and a quality and returns the number of semitones
+class HeadMusic::DiatonicInterval::Semitones
+  QUALITY_SEMITONES = HeadMusic::DiatonicInterval::QUALITY_SEMITONES
+
+  attr_reader :count
+
+  def initialize(name, quality_name)
+    @count = self.class.degree_quality_semitones.dig(name, quality_name)
+  end
+
+  def self.degree_quality_semitones
+    @degree_quality_semitones ||= {}.tap do |degree_quality_semitones|
+      QUALITY_SEMITONES.each do |degree_name, qualities|
+        default_quality = qualities.keys.first
+        default_semitones = qualities[default_quality]
+        degree_quality_semitones[degree_name] = _semitones_for_degree(default_quality, default_semitones)
+      end
+    end
+  end
+
+  def self._semitones_for_degree(quality, default_semitones)
+    {}.tap do |semitones|
+      _degree_quality_modifications(quality).each do |current_quality, delta|
+        semitones[current_quality] = default_semitones + delta
+      end
+    end
+  end
+
+  def self._degree_quality_modifications(quality)
+    if quality == :perfect
+      HeadMusic::Quality::PERFECT_INTERVAL_MODIFICATION.invert
+    else
+      HeadMusic::Quality::MAJOR_INTERVAL_MODIFICATION.invert
+    end
+  end
+end

data/lib/head_music/diatonic_interval/size.rb

@@ -0,0 +1,50 @@
+# Encapsulate the distance methods of the interval
+class HeadMusic::DiatonicInterval::Size
+  attr_reader :low_pitch, :high_pitch
+
+  def initialize(pitch1, pitch2)
+    @low_pitch, @high_pitch = *[pitch1, pitch2].sort
+  end
+
+  def number
+    @number ||= @low_pitch.steps_to(@high_pitch) + 1
+  end
+
+  def simple_number
+    @simple_number ||= octave_equivalent? ? 8 : (number - 1) % 7 + 1
+  end
+
+  def octaves
+    @octaves ||= number / 8
+  end
+
+  def simple?
+    number <= 8
+  end
+
+  def compound?
+    !simple?
+  end
+
+  def simple_semitones
+    @simple_semitones ||= semitones % 12
+  end
+
+  def semitones
+    (high_pitch - low_pitch).to_i
+  end
+
+  def steps
+    number - 1
+  end
+
+  def simple_steps
+    steps % 7
+  end
+
+  private
+
+  def octave_equivalent?
+    number > 1 && ((number - 1) % 7).zero?
+  end
+end

data/lib/head_music/diatonic_interval.rb

@@ -43,237 +43,13 @@ class HeadMusic::DiatonicInterval
   delegate :to_s, to: :name
   delegate :perfect?, :major?, :minor?, :diminished?, :augmented?, :doubly_diminished?, :doubly_augmented?, to: :quality
 
-  # Interprets a string or symbol
-  class Parser
-    attr_reader :identifier
-
-    def initialize(identifier)
-      @identifier = expand(identifier)
-    end
-
-    def words
-      identifier.to_s.split(/[_ ]+/)
-    end
-
-    def quality_name
-      words[0..-2].join(" ").to_sym
-    end
-
-    def degree_name
-      words.last
-    end
-
-    def steps
-      NUMBER_NAMES.index(degree_name)
-    end
-
-    def higher_letter
-      HeadMusic::Pitch.middle_c.letter_name.steps_up(steps)
-    end
-
-    def expand(identifier)
-      if /[A-Z]\d{1,2}/i.match?(identifier)
-        number = NUMBER_NAMES[identifier.gsub(/[A-Z]/i, "").to_i - 1]
-        return [quality_for(identifier[0]), number].join("_").to_sym
-      end
-      identifier
-    end
-
-    def quality_for(abbreviation)
-      QUALITY_ABBREVIATIONS[abbreviation.to_sym] ||
-        QUALITY_ABBREVIATIONS[abbreviation.upcase.to_sym] ||
-        QUALITY_ABBREVIATIONS[abbreviation.downcase.to_sym]
-    end
-  end
-
-  # Accepts a name and a quality and returns the number of semitones
-  class Semitones
-    attr_reader :count
-
-    def initialize(name, quality_name)
-      @count = Semitones.degree_quality_semitones.dig(name, quality_name)
-    end
-
-    def self.degree_quality_semitones
-      @degree_quality_semitones ||= {}.tap do |degree_quality_semitones|
-        QUALITY_SEMITONES.each do |degree_name, qualities|
-          default_quality = qualities.keys.first
-          default_semitones = qualities[default_quality]
-          degree_quality_semitones[degree_name] = _semitones_for_degree(default_quality, default_semitones)
-        end
-      end
-    end
-
-    def self._semitones_for_degree(quality, default_semitones)
-      {}.tap do |semitones|
-        _degree_quality_modifications(quality).each do |current_quality, delta|
-          semitones[current_quality] = default_semitones + delta
-        end
-      end
-    end
-
-    def self._degree_quality_modifications(quality)
-      if quality == :perfect
-        HeadMusic::Quality::PERFECT_INTERVAL_MODIFICATION.invert
-      else
-        HeadMusic::Quality::MAJOR_INTERVAL_MODIFICATION.invert
-      end
-    end
-  end
-
-  # Accepts the letter name count between two notes and categorizes the interval
-  class Category
-    attr_reader :number
-
-    def initialize(number)
-      @number = number
-    end
-
-    def step?
-      number == 2
-    end
-
-    def skip?
-      number == 3
-    end
-
-    def leap?
-      number >= 3
-    end
-
-    def large_leap?
-      number > 3
-    end
-  end
-
-  # Encapsulate the distance methods of the interval
-  class Size
-    attr_reader :low_pitch, :high_pitch
-
-    def initialize(pitch1, pitch2)
-      @low_pitch, @high_pitch = *[pitch1, pitch2].sort
-    end
-
-    def number
-      @number ||= @low_pitch.steps_to(@high_pitch) + 1
-    end
-
-    def simple_number
-      @simple_number ||= octave_equivalent? ? 8 : (number - 1) % 7 + 1
-    end
-
-    def octaves
-      @octaves ||= number / 8
-    end
-
-    def simple?
-      number <= 8
-    end
-
-    def compound?
-      !simple?
-    end
-
-    def simple_semitones
-      @simple_semitones ||= semitones % 12
-    end
-
-    def semitones
-      (high_pitch - low_pitch).to_i
-    end
-
-    def steps
-      number - 1
-    end
-
-    def simple_steps
-      steps % 7
-    end
-
-    private
-
-    def octave_equivalent?
-      number > 1 && ((number - 1) % 7).zero?
-    end
-  end
-
-  # Accepts a number and number of semitones and privides the naming methods.
-  class Naming
-    attr_reader :number, :semitones
-
-    def initialize(number:, semitones:)
-      @number = number
-      @semitones = semitones
-    end
-
-    def simple_semitones
-      @simple_semitones ||= semitones % 12
-    end
-
-    def simple_number
-      @simple_number ||= octave_equivalent? ? 8 : (number - 1) % 7 + 1
-    end
-
-    def simple_name
-      [quality_name, simple_number_name].join(" ")
-    end
-
-    def quality_name
-      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)
-    end
-
-    def simple_number_name
-      NUMBER_NAMES[simple_number - 1]
-    end
-
-    def number_name
-      NUMBER_NAMES[number - 1] || (number.to_s + NAME_SUFFIXES[number % 10])
-    end
-
-    def name
-      if named_number?
-        [quality_name, number_name].join(" ")
-      elsif simple_name == "perfect octave"
-        "#{octaves.humanize} octaves"
-      else
-        "#{octaves.humanize} octaves and #{quality.article} #{simple_name}"
-      end
-    end
-
-    def shorthand
-      step_shorthand = (number == 1) ? "U" : number
-      [quality.shorthand, step_shorthand].join
-    end
-
-    private
-
-    def named_number?
-      number < NUMBER_NAMES.length
-    end
-
-    def quality
-      @quality ||= HeadMusic::Quality.get(quality_name)
-    end
-
-    def octaves
-      @octaves ||= semitones / 12
-    end
-
-    def octave_equivalent?
-      number > 1 && ((number - 1) % 7).zero?
-    end
-  end
-
   delegate :step?, :skip?, :leap?, :large_leap?, to: :category
   delegate(
     :simple_number, :octaves, :number, :simple?, :compound?, :semitones, :simple_semitones, :steps, :simple_steps,
     to: :size
   )
   delegate(
-    :simple_semitones, :simple_name, :quality_name, :simple_number_name, :number_name, :name, :shorthand,
+    :simple_name, :quality_name, :simple_number_name, :number_name, :name, :shorthand,
     to: :naming
   )
 
@@ -378,10 +154,6 @@ class HeadMusic::DiatonicInterval
     @naming ||= Naming.new(number: number, semitones: semitones)
   end
 
-  def named_number?
-    number < NUMBER_NAMES.length
-  end
-
   def consonance_for_perfect(style = :standard_practice)
     HeadMusic::Consonance.get(dissonant_fourth?(style) ? :dissonant : :perfect) if perfect?
   end

data/lib/head_music/instrument/staff_scheme.rb

@@ -1,8 +1,8 @@
 class HeadMusic::Instrument::StaffScheme
-  attr_reader :pitch_variant, :key, :list
+  attr_reader :variant, :key, :list
 
-  def initialize(pitch_variant:, key:, list:)
-    @pitch_variant = pitch_variant
+  def initialize(variant:, key:, list:)
+    @variant = variant
     @key = key || "default"
     @list = list
   end

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

@@ -1,4 +1,4 @@
-class HeadMusic::Instrument::PitchVariant
+class HeadMusic::Instrument::Variant
   attr_reader :key, :attributes
 
   def initialize(key, attributes = {})
@@ -6,11 +6,11 @@ class HeadMusic::Instrument::PitchVariant
     @attributes = attributes
   end
 
-  def fundamental_pitch_spelling
-    return unless attributes["fundamental_pitch_spelling"].to_s != ""
+  def pitch_designation
+    return unless attributes["pitch_designation"].to_s != ""
 
-    @fundamental_pitch_spelling ||=
-      HeadMusic::Spelling.get(attributes["fundamental_pitch_spelling"])
+    @pitch_designation ||=
+      HeadMusic::Spelling.get(attributes["pitch_designation"])
   end
 
   def staff_schemes
@@ -18,7 +18,7 @@ class HeadMusic::Instrument::PitchVariant
       (attributes["staff_schemes"] || {}).map do |key, list|
         HeadMusic::Instrument::StaffScheme.new(
           key: key,
-          pitch_variant: self,
+          variant: self,
           list: list
         )
       end

data/lib/head_music/instrument.rb

@@ -9,8 +9,8 @@
 #   default_clefs: the default clef or system of clefs for the instrument
 #     - [treble] for instruments that use the treble clef
 #     - [treble, bass] for instruments that use the grand staff
-#   pitch_variants:
-#     a hash of default and alternative fundamental pitches.
+#   variants:
+#     a hash of default and alternative pitch designations
 # Associations:
 #   family: the family of the instrument (e.g. "saxophone")
 #   orchestra_section: the section of the orchestra (e.g. "strings")
@@ -32,7 +32,7 @@ class HeadMusic::Instrument
   attr_reader(
     :name_key, :alias_name_keys,
     :family_key, :orchestra_section_key,
-    :pitch_variants, :classification_keys
+    :variants, :classification_keys
   )
 
   def ==(other)
@@ -75,12 +75,12 @@ class HeadMusic::Instrument
     default_clefs.any?
   end
 
-  def default_pitch_variant
-    pitch_variants.find(&:default?) || pitch_variants.first
+  def default_variant
+    variants.find(&:default?) || variants.first
   end
 
   def default_staff_scheme
-    default_pitch_variant&.default_staff_scheme
+    default_variant&.default_staff_scheme
   end
 
   def default_staves
@@ -158,9 +158,9 @@ class HeadMusic::Instrument
   def initialize_attributes(record)
     @orchestra_section_key ||= record["orchestra_section_key"]
     @classification_keys = [@classification_keys, record["classification_keys"]].flatten.compact.uniq
-    @pitch_variants =
-      (record["pitch_variants"] || {}).map do |key, attributes|
-        HeadMusic::Instrument::PitchVariant.new(key, attributes)
+    @variants =
+      (record["variants"] || {}).map do |key, attributes|
+        HeadMusic::Instrument::Variant.new(key, attributes)
       end
   end
 

data/lib/head_music/key_signature/enharmonic_equivalence.rb

@@ -15,16 +15,12 @@ class HeadMusic::KeySignature::EnharmonicEquivalence
   def enharmonic_equivalent?(other)
     other = HeadMusic::KeySignature.get(other)
 
-    p key_signature.pitch_classes.map(&:to_i).sort
-    p other.pitch_classes.map(&:to_i).sort
-    p key_signature.alterations.map(&:to_s).sort
-    p other.alterations.map(&:to_s).sort
     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
   end
 
-  # alias_method :enharmonic?, :enharmonic_equivalent?
-  # alias_method :equivalent?, :enharmonic_equivalent?
+  alias_method :enharmonic?, :enharmonic_equivalent?
+  alias_method :equivalent?, :enharmonic_equivalent?
 
   private_class_method :new
 end

data/lib/head_music/key_signature.rb

@@ -1,5 +1,4 @@
 # Represents a key signature.
-# In French, sharps and flats in the key signature are called "altérations".
 class HeadMusic::KeySignature
   attr_reader :tonic_spelling, :scale_type, :scale
 

data/lib/head_music/locales/en.yml

@@ -100,6 +100,7 @@ en:
       wind_instrument: wind instrument
       wood: wood
       woodwind: woodwind
+    instrument_with_pitch_designation: "%{instrument} in %{pitch_designation}"
     instrument_voices:
       piccolo: piccolo
       soprano: soprano
@@ -126,27 +127,17 @@ en:
       bass_oboe: bass oboe
       bass_trombone: bass trombone
       bass_trumpet: bass trumpet
-      bass_trumpet_in_b_flat: bass trumpet in B♭
-      bass_trumpet_in_c: bass trumpet in C
-      bass_trumpet_in_e_flat: bass trumpet in E♭
       bass_tuba: bass tuba
-      bass_tuba_in_e_flat: bass tuba in E♭
-      bass_tuba_in_f: bass tuba in F
       bass_voice: bass
       basset_horn: basset horn
       bassoon: bassoon
       bugle: bugle
-      bugle_in_b_flat: bugle in B♭
       castanets: castanets
       celesta: celesta
       cello: cello
       chimes: chimes
       cimbalom: cimbalom
       clarinet: clarinet
-      clarinet_in_a: clarinet in A
-      clarinet_in_c: clarinet in C
-      clarinet_in_d: clarinet in D
-      clarinet_in_e_flat: clarinet in E♭
       clash_cymbals: clash cymbals
       clavichord: clavichord
       contrabass_clarinet: contrabass clarinet
@@ -202,11 +193,7 @@ en:
       triangle: triangle
       trombone: trombone
       trumpet: trumpet
-      trumpet_in_c: trumpet in C
-      trumpet_in_d: trumpet in D
-      trumpet_in_e_flat: trumpet in E♭
       tuba: tuba
-      tuba_in_c: tuba in C
       tubular_bells: tubular bells
       vibraphone: vibraphone
       viola: viola

data/lib/head_music/named.rb

@@ -103,8 +103,4 @@ module HeadMusic::Named
   def localized_name_in_default_locale
     localized_names.detect { |name| name.locale_code == Locale::DEFAULT_CODE }
   end
-
-  def hash_key
-    HeadMusic::Utilities::HashKey.for(name)
-  end
 end

data/lib/head_music/scale_degree.rb

@@ -1,4 +1,4 @@
-# A scale degree is a number indicating the ordinality of the spelling in the key signature.
+# A scale degree is a number indicating the ordinality of the spelling in the key.
 # TODO: Rewrite to accept a tonal_center and a scale type.
 class HeadMusic::ScaleDegree
   include Comparable
@@ -20,20 +20,25 @@ class HeadMusic::ScaleDegree
   end
 
   def alteration
-    alteration_semitones = spelling.alteration&.semitones || 0
+    spelling_alteration_semitones = spelling.alteration&.semitones || 0
     usual_sign_semitones = scale_degree_usual_spelling.alteration&.semitones || 0
-    delta = alteration_semitones - usual_sign_semitones
+    delta = spelling_alteration_semitones - usual_sign_semitones
     HeadMusic::Alteration.by(:semitones, delta) if delta != 0
   end
 
+  def alteration_semitones
+    alteration&.semitones || 0
+  end
+
   def to_s
     "#{alteration}#{degree}"
   end
 
   def <=>(other)
     if other.is_a?(HeadMusic::ScaleDegree)
-      [degree, alteration.semitones] <=> [other.degree, other.alteration.semitones]
+      [degree, alteration_semitones] <=> [other.degree, other.alteration_semitones]
     else
+      # TODO: Improve this
       to_s <=> other.to_s
     end
   end