head_music 6.0.1 → 7.0.1

data/lib/head_music/locales/en.yml

@@ -92,16 +92,18 @@ en:
       shaken: shaken
       single_reed: single-reed
       string: string
-      strings: strings
       stringed_instrument: stringed instrument
+      strings: strings
       struck: struck
       voice: voice
       wind: wind
       wind_instrument: wind instrument
       wood: wood
       woodwind: woodwind
+    instrument_with_pitch_designation: "%{instrument} in %{pitch_designation}"
     instrument_voices:
       piccolo: piccolo
+      sopranino: sopranino
       soprano: soprano
       mezzo_soprano: mezzo-soprano
       alto: alto
@@ -109,105 +111,163 @@ en:
       baritone: baritone
       bass: bass
       contrabass: contrabass
-      octobass: octobass
+      subcontrabass: subcontrabass
     instruments:
       accordion: accordion
       alto_clarinet: alto clarinet
       alto_flute: alto flute
+      alto_recorder: alto recorder
+      alto_saxophone: alto saxophone
       alto_voice: alto
       arpeggione: arpeggione
       bagpipe: bagpipe
+      bagpipes: bagpipes
       banjo: banjo
       baritone_horn: baritone horn
+      baritone_oboe: baritone oboe
+      baritone_saxophone: baritone saxophone
       baritone_voice: baritone
+      bass: bass
       bass_clarinet: bass clarinet
       bass_drum: bass drum
       bass_guitar: bass guitar
       bass_oboe: bass oboe
+      bass_recorder: bass recorder
+      bass_saxophone: bass saxophone
       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
+      basset_recorder: basset recorder
       bassoon: bassoon
+      bells: bells
       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♭
+      clarion: clarion
       clash_cymbals: clash cymbals
       clavichord: clavichord
+      concert_bells: concert bells
+      concert_cymbals: concert cymbals
+      contra_great_bass_recorder: contra-great bass recorder
+      contrabass: contrabass
       contrabass_clarinet: contrabass clarinet
+      contrabass_recorder: contrabass recorder
+      contrabass_saxophone: contrabass saxophone
+      contrabass_tuba: contrabass tuba
       contrabassoon: contrabassoon
+      contralto: contralto
+      contralto_voice: contralto
       cor_anglais: cor anglais
       cornet: cornet
-      cowbell: cowbell
       countertenor_voice: countertenor
+      cowbell: cowbell
+      crash_cymbal: crash cymbal
+      crash_cymbals: crash cymbals
       crotales: crotales
       cymbal: cymbal
+      descant: descant
       double_bass: double bass
+      double_contrabass_recorder: double-contrabass recorder
       english_horn: English horn
       euphonium: euphonium
+      fiddle: fiddle
+      field_drum: field drum
       flugelhorn: flugelhorn
       flute: flute
+      fortepiano: fortepiano
       french_horn: French horn
+      garklein_recorder: garklein recorder
       glockenspiel: glockenspiel
+      gong: gong
+      great_bass_recorder: great bass recorder
       great_highland_bagpipe: great highland bagpipe
       guitar: guitar
       hammered_dulcimer: hammered dulcimer
       harp: harp
       harpsichord: harpsichord
+      hautbois_d_amour: hautbois d'amour
+      hi-hat: hi-hat
       horn: horn
+      kettledrum: kettledrum
+      kick_drum: kick drum
       lute: lute
       mandolin: mandolin
       maracas: maracas
       marimba: marimba
       metal_block: metal block
+      mezzo: mezzo
+      mezzo_soprano: mezzo-soprano
+      mezzo_soprano_voice: mezzo-soprano
+      military_drum: military drum
       natural_horn: natural horn
       oboe: oboe
       oboe_d_amore: oboe d'amore
+      octocontrabass_recorder: octocontrabass recorder
+      orchestral_chimes: orchestral chimes
+      orchestral_cymbals: orchestral cymbals
       organ: organ
       piano: piano
+      pianoforte: pianoforte
       piccolo: piccolo
       piccolo_clarinet: piccolo clarinet
       piccolo_flute: piccolo flute
+      piccolo_recorder: piccolo recorder
+      piccolo_saxophone: piccolo saxophone
       piccolo_trumpet: piccolo trumpet
+      pipe_organ: pipe organ
+      quart_bass_recorder: quart bass recorder
       recorder: recorder
+      ride_cymbal: ride cymbal
       saxophone: saxophone
       side_drum: side drum
       snare_drum: snare drum
+      sopranino_clarinet: sopranino clarinet
+      sopranino_recorder: sopranino recorder
+      sopranino_saxophone: sopranino saxophone
+      sopranissimo_recorder: sopranissimo recorder
+      sopranissimo_saxophone: sopranissimo saxophone
+      soprano: soprano
+      soprano_clarinet: soprano clarinet
+      soprano_recorder: soprano recorder
+      soprano_saxophone: soprano saxophone
       soprano_voice: soprano
+      soprillo: soprillo
       sousaphone: sousaphone
+      string_bass: string bass
+      sub_bass_recorder: sub-bass recorder
+      sub_contrabass_recorder: sub-contrabass recorder
+      sub_great_bass_recorder: sub-great bass recorder
+      subcontrabass_saxophone: subcontrabass saxophone
       suspended_cymbal: suspended cymbal
       synthesizer: synthesizer
+      tabor: tabor
       tam_tam: tam-tam
       tambourine: tambourine
       temple_blocks: temple blocks
+      tenor: tenor
       tenor_drum: tenor drum
+      tenor_recorder: tenor recorder
+      tenor_saxophone: tenor saxophone
       tenor_trombone: tenor trombone
+      tenor_tuba: tenor tuba
       tenor_voice: tenor
       timpani: timpani
+      timpanum: timpanum
+      tom_drum: tom drum
+      tom_tom: tom-tom
+      treble_recorder: treble recorder
       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
+      vibes: vibes
       vibraphone: vibraphone
       viola: viola
       viola_d_amore: viola d'amore

data/lib/head_music/locales/fr.yml

@@ -57,7 +57,6 @@ fr:
       alto: alto
       baritone: baryton
       bass: basse
-      contralto: contralto
       countertenor: contre-ténor
       mezzo_soprano: mezzo-soprano
       soprano: soprano

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

data/lib/head_music/style/guidelines/notes_same_length.rb

@@ -37,10 +37,6 @@ class HeadMusic::Style::Guidelines::NotesSameLength < HeadMusic::Style::Annotati
     notes[0..-2]
   end
 
-  def distinct_values
-    all_but_last_note.map(&:rhythmic_value).uniq.length
-  end
-
   def first_most_common_rhythmic_value
     @first_most_common_rhythmic_value ||= begin
       candidates = most_common_rhythmic_values

data/lib/head_music/style/mark.rb

@@ -33,8 +33,5 @@ class HeadMusic::Style::Mark
   def code
     [start_position, end_position].join(" to ")
   end
-
-  def to_s
-    code
-  end
+  alias_method :to_s, :code
 end

data/lib/head_music/version.rb

@@ -1,3 +1,3 @@
 module HeadMusic
-  VERSION = "6.0.1"
+  VERSION = "7.0.1"
 end

data/lib/head_music.rb

@@ -38,12 +38,17 @@ require "head_music/circle"
 require "head_music/clef"
 require "head_music/consonance"
 require "head_music/diatonic_interval"
+require "head_music/diatonic_interval/category"
+require "head_music/diatonic_interval/naming"
+require "head_music/diatonic_interval/parser"
+require "head_music/diatonic_interval/semitones"
+require "head_music/diatonic_interval/size"
 require "head_music/harmonic_interval"
 require "head_music/instrument_family"
 require "head_music/instrument"
-require "head_music/instrument/pitch_variant"
 require "head_music/instrument/staff_scheme"
 require "head_music/instrument/staff"
+require "head_music/instrument/variant"
 require "head_music/interval_cycle"
 require "head_music/key_signature"
 require "head_music/key_signature/enharmonic_equivalence"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: head_music
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 7.0.1
 platform: ruby
 authors:
 - Rob Head
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-30 00:00:00.000000000 Z
+date: 2024-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -136,11 +136,16 @@ files:
 - lib/head_music/data/instrument_families.yml
 - lib/head_music/data/instruments.yml
 - lib/head_music/diatonic_interval.rb
+- lib/head_music/diatonic_interval/category.rb
+- lib/head_music/diatonic_interval/naming.rb
+- lib/head_music/diatonic_interval/parser.rb
+- lib/head_music/diatonic_interval/semitones.rb
+- lib/head_music/diatonic_interval/size.rb
 - lib/head_music/harmonic_interval.rb
 - lib/head_music/instrument.rb
-- lib/head_music/instrument/pitch_variant.rb
 - lib/head_music/instrument/staff.rb
 - lib/head_music/instrument/staff_scheme.rb
+- lib/head_music/instrument/variant.rb
 - lib/head_music/instrument_family.rb
 - lib/head_music/interval_cycle.rb
 - lib/head_music/key_signature.rb