head_music 8.2.0 → 8.3.0

data/lib/head_music/analysis/diatonic_interval.rb

@@ -4,8 +4,8 @@ module HeadMusic::Analysis; end
 # A diatonic interval is the distance between two spelled pitches.
 class HeadMusic::Analysis::DiatonicInterval
   include Comparable
+  include HeadMusic::Named
 
-  # TODO: include Named module
   NUMBER_NAMES = %w[
     unison second third fourth fifth sixth seventh octave
     ninth tenth eleventh twelfth thirteenth fourteenth fifteenth
@@ -43,7 +43,6 @@ class HeadMusic::Analysis::DiatonicInterval
 
   attr_reader :lower_pitch, :higher_pitch
 
-  delegate :to_s, to: :name
   delegate :perfect?, :major?, :minor?, :diminished?, :augmented?, :doubly_diminished?, :doubly_augmented?, to: :quality
 
   delegate :step?, :skip?, :leap?, :large_leap?, to: :category
@@ -52,18 +51,40 @@ class HeadMusic::Analysis::DiatonicInterval
     to: :size
   )
   delegate(
-    :simple_name, :quality_name, :simple_number_name, :number_name, :name, :shorthand,
+    :simple_name, :quality_name, :simple_number_name, :number_name, :shorthand,
     to: :naming
   )
 
   alias_method :to_i, :semitones
 
+  # Override Named module methods to use computed name from naming
+  def name(locale_code: nil)
+    if locale_code
+      # Try to get translation from locale files
+      name_key = naming.name.downcase.gsub(" ", "_").to_sym
+      translation = I18n.translate(name_key, scope: "head_music.diatonic_intervals", locale: locale_code, default: nil)
+      translation || naming.name
+    else
+      naming.name
+    end
+  end
+
+  def to_s
+    name
+  end
+
   # Accepts a name and returns the interval with middle c on the bottom
   def self.get(identifier)
-    name = Parser.new(identifier)
-    semitones = Semitones.new(name.degree_name.to_sym, name.quality_name).count
-    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)
+    if identifier.is_a?(String) || identifier.is_a?(Symbol)
+      name = Parser.new(identifier)
+      semitones = Semitones.new(name.degree_name.to_sym, name.quality_name).count
+      higher_pitch = HeadMusic::Rudiment::Pitch.from_number_and_letter(HeadMusic::Rudiment::Pitch.middle_c + semitones, name.higher_letter)
+      interval = new(HeadMusic::Rudiment::Pitch.middle_c, higher_pitch)
+      interval.ensure_localized_name(name: identifier.to_s)
+      interval
+    else
+      identifier
+    end
   end
 
   def initialize(first_pitch, second_pitch)

data/lib/head_music/analysis/sonority.rb

@@ -110,7 +110,7 @@ class HeadMusic::Analysis::Sonority
   alias_method :quintal?, :quartal?
 
   def diatonic_intervals_above_bass_pitch
-    return nil unless identifier
+    return [] unless identifier
 
     @diatonic_intervals_above_bass_pitch ||=
       SONORITIES[identifier].map { |shorthand| HeadMusic::Analysis::DiatonicInterval.get(shorthand) }

data/lib/head_music/content/staff.rb

@@ -8,12 +8,22 @@ class HeadMusic::Content::Staff
   attr_reader :default_clef, :line_count, :instrument
 
   def initialize(default_clef_key, instrument: nil, line_count: nil)
-    @default_clef = HeadMusic::Rudiment::Clef.get(default_clef_key)
-    @line_count = line_count || DEFAULT_LINE_COUNT
     @instrument = HeadMusic::Instruments::Instrument.get(instrument) if instrument
+    begin
+      @default_clef = HeadMusic::Rudiment::Clef.get(default_clef_key)
+    rescue KeyError, NoMethodError
+      puts("Warning: Clef '#{default_clef_key}' not found.")
+      if @instrument
+        puts("Using instrument clef.")
+        @default_clef = @instrument.default_staves.first.clef
+      else
+        @default_clef = HeadMusic::Rudiment::Clef.get(:treble_clef)
+      end
+    end
+    @line_count = line_count || DEFAULT_LINE_COUNT
   end
 
   def clef
-    default_clef || instrument&.default_staves&.first&.clef
+    default_clef
   end
 end

data/lib/head_music/content/voice.rb

@@ -110,6 +110,14 @@ class HeadMusic::Content::Voice
     placements.last.position.bar_number
   end
 
+  def last_placement
+    placements.last
+  end
+
+  def next_position
+    last_placement ? last_placement.next_position : HeadMusic::Content::Position.new(composition, 1, 1, 0)
+  end
+
   def to_s
     return pitches_string if role.to_s.strip == ""
 

data/lib/head_music/instruments/instrument.rb

@@ -82,9 +82,7 @@ class HeadMusic::Instruments::Instrument
     variants.find(&:default?) || variants.first
   end
 
-  def default_staff_scheme
-    default_variant&.default_staff_scheme
-  end
+  delegate :default_staff_scheme, to: :default_variant
 
   def default_staves
     default_staff_scheme&.staves || []

data/lib/head_music/instruments/instrument_families.yml

@@ -14,6 +14,12 @@ bagpipe:
     - wind
     - woodwind
   orchestra_section_key: woodwind
+bass_drum:
+  classification_keys:
+    - percussion
+    - membranophone
+    - unpitched
+  orchestra_section_key: percussion
 bassoon:
   classification_keys:
     - aerophone
@@ -22,6 +28,15 @@ bassoon:
     - wind
     - woodwind
   orchestra_section_key: woodwind
+celesta:
+  classification_keys:
+    - idiophone
+    - keyboard
+    - percussion
+    - struck
+    - metal
+    - pitched
+  orchestra_section_key: keyboard
 clarinet:
   classification_keys:
     - aerophone
@@ -34,13 +49,13 @@ clavichord:
   classification_keys:
     - chordophone
     - keyboard
-    - percussion
     - string
   orchestra_section_key: keyboard
 cornet:
   classification_keys:
     - aerophone
     - brass
+    - valve
     - wind
   orchestra_section_key: brass
 cymbal:
@@ -57,6 +72,7 @@ double_bass:
   classification_keys:
     - bowed
     - chordophone
+    - unfretted
     - string
   orchestra_section_key: string
 flute:
@@ -86,6 +102,7 @@ guitar:
   classification_keys:
     - chordophone
     - plucked
+    - fretted
     - string
   orchestra_section_key: string
 harmonica:
@@ -105,13 +122,13 @@ harpsichord:
   classification_keys:
     - chordophone
     - keyboard
-    - percussion
     - string
   orchestra_section_key: keyboard
 horn:
   classification_keys:
     - aerophone
     - brass
+    - valve
     - wind
   orchestra_section_key: brass
 kettledrum:
@@ -124,12 +141,14 @@ lute:
   classification_keys:
     - chordophone
     - plucked
+    - fretted
     - string
   orchestra_section_key: string
 mandolin:
   classification_keys:
     - chordophone
     - plucked
+    - fretted
     - string
   orchestra_section_key: string
 marimba:
@@ -141,6 +160,7 @@ marimba:
     - wood
     - mallet
     - pitched
+    - resonator
   orchestra_section_key: percussion
 oboe:
   classification_keys:
@@ -172,6 +192,7 @@ saxhorn:
   classification_keys:
     - aerophone
     - brass
+    - valve
     - wind
   orchestra_section_key: brass
 saxophone:
@@ -186,6 +207,7 @@ sitar:
   classification_keys:
     - chordophone
     - plucked
+    - fretted
     - string
   orchestra_section_key: string
 snare_drum:
@@ -213,6 +235,14 @@ tabla:
     - membranophone
     - pitched
   orchestra_section_key: percussion
+tambourine:
+  classification_keys:
+    - percussion
+    - membranophone
+    - shaken
+    - idiophone
+    - unpitched
+  orchestra_section_key: percussion
 theremin:
   classification_keys:
     - electronic
@@ -226,18 +256,21 @@ trumpet:
   classification_keys:
     - aerophone
     - brass
+    - valve
     - wind
   orchestra_section_key: brass
 tuba:
   classification_keys:
     - aerophone
     - brass
+    - valve
     - wind
   orchestra_section_key: brass
 ukulele:
   classification_keys:
     - chordophone
     - plucked
+    - fretted
     - string
   orchestra_section_key: string
 vibraphone:
@@ -249,11 +282,13 @@ vibraphone:
     - mallet
     - metal
     - pitched
+    - resonator
   orchestra_section_key: percussion
 violin:
   classification_keys:
     - bowed
     - chordophone
+    - unfretted
     - string
   orchestra_section_key: string
 voice: