head_music 6.0.0 → 7.0.0

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/motion.rb

@@ -48,7 +48,9 @@ class HeadMusic::Motion
   end
 
   def to_s
-    "#{contrapuntal_motion} motion from #{first_harmonic_interval} to #{second_harmonic_interval}"
+    return "repetition of a #{second_harmonic_interval}" unless contrapuntal_motion != :repetition
+
+    "#{contrapuntal_motion} motion from a #{first_harmonic_interval} to a #{second_harmonic_interval}"
   end
 
   private

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/pitch_class_set.rb

@@ -10,13 +10,10 @@ class HeadMusic::PitchClassSet
     @pitch_classes = identifiers.map { |identifier| HeadMusic::PitchClass.get(identifier) }.uniq.sort
   end
 
-  def inspect
-    pitch_classes.map(&:to_s).join(" ")
-  end
-
   def to_s
-    pitch_classes.map(&:to_s).join(" ")
+    pitch_classes.map(&:to_i).inspect
   end
+  alias_method :inspect, :to_s
 
   def ==(other)
     pitch_classes == other.pitch_classes

data/lib/head_music/scale.rb

@@ -28,6 +28,10 @@ class HeadMusic::Scale
     @pitches[direction][octaves] ||= determine_scale_pitches(direction, octaves)
   end
 
+  def pitch_classes
+    pitches.map(&:pitch_class).uniq
+  end
+
   def spellings(direction: :ascending, octaves: 1)
     pitches(direction: direction, octaves: octaves).map(&:spelling).map(&:to_s)
   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.0"
+  VERSION = "7.0.0"
 end

data/lib/head_music.rb

@@ -38,14 +38,20 @@ 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"
 require "head_music/letter_name"
 require "head_music/melodic_interval"
 require "head_music/meter"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: head_music
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 7.0.0
 platform: ruby
 authors:
 - Rob Head
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-29 00:00:00.000000000 Z
+date: 2024-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -136,14 +136,20 @@ 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
+- lib/head_music/key_signature/enharmonic_equivalence.rb
 - lib/head_music/letter_name.rb
 - lib/head_music/locales/de.yml
 - lib/head_music/locales/en.yml