head_music 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee7c3b6377d30fa88d3f9e7f5b5450bf0664c65b4559ba6fccaf79d19ef3cfcf
-  data.tar.gz: 56ec218fb604b9c1c2fe3a6c2935a1157340afc0a23f3cb882ad9dd9980f1bcd
+  metadata.gz: 64230af5264efb58e93a127cc3ad7528f9fd33f663b98ba117bb49d746e500ce
+  data.tar.gz: c6c72eb473869b2aa01dc80f37d54787dda8816f0ac46404d365ee30431f6eab
 SHA512:
-  metadata.gz: 6c8b2afd59aae59bcd88a8d67aa1662e79d6086166da1588bdf502a720fb471b2c55b3b6ada13eb7f09e998cd8b8c8408ec4888303d0edd9cdf09accc64c92ed
-  data.tar.gz: 4076e9b2b22c369f6f7e08bd202cf333d54c410df206bcc0d06417a68142be232ef58fe174aae627922e5a5ef993a9f247e706d23c17cce0f927b49198f3b987
+  metadata.gz: c049302d49e156b572c3dc0aeb8b9cf59db93ec77ca0e0636c4a64375e4c5648a886ec21ec3e63077981c938317841989df0825c153848aef45b16b13117df2a
+  data.tar.gz: 4dddb70eeb88d7ae04f4184365c791d650731524c2d35c6a300b22227bc24fba921c9efa3d6fa9a0212a7a4f43e2680a0c0cdfbbcc580b11ea17bc9e39ebc4be

data/.rubocop.yml

@@ -26,4 +26,4 @@ RSpec/ContextWording:
     - by
 
 RSpec/NestedGroups:
-  Max: 4
+  Max: 5

data/lib/head_music/content/voice.rb

@@ -105,7 +105,9 @@ class HeadMusic::Content::Voice
   end
 
   def to_s
-    "#{role}: #{pitches.first(10).map(&:to_s)}"
+    return pitches_string if role.to_s.strip == ""
+
+    [role, pitches_string].join(": ")
   end
 
   private
@@ -114,4 +116,8 @@ class HeadMusic::Content::Voice
     @placements << placement
     @placements = @placements.sort
   end
+
+  def pitches_string
+    pitches.first(10).map(&:to_s).join(" ")
+  end
 end

data/lib/head_music/instrument/staff.rb

@@ -21,7 +21,7 @@ class HeadMusic::Instrument::Staff
   end
 
   def name_key
-    attributes["name_key"]
+    attributes["name_key"] || ""
   end
 
   def name

data/lib/head_music/key_signature/enharmonic_equivalence.rb

@@ -0,0 +1,30 @@
+# Key signatures are enharmonic when all pitch classes in one are respellings of the pitch classes in the other.
+class HeadMusic::KeySignature::EnharmonicEquivalence
+  attr_reader :key_signature
+
+  def self.get(key_signature)
+    key_signature = HeadMusic::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)
+  end
+
+  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?
+
+  private_class_method :new
+end

data/lib/head_music/key_signature.rb

@@ -21,7 +21,7 @@ class HeadMusic::KeySignature
 
   delegate :pitch_class, to: :tonic_spelling, prefix: :tonic
   delegate :to_s, to: :name
-  delegate :pitches, to: :scale
+  delegate :pitches, :pitch_classes, to: :scale
 
   def initialize(tonic_spelling, scale_type = nil)
     @tonic_spelling = HeadMusic::Spelling.get(tonic_spelling)
@@ -67,19 +67,23 @@ class HeadMusic::KeySignature
     flats.length + double_flats.length * 2
   end
 
-  def signs
-    flats.any? ? flats : sharps
+  def num_alterations
+    num_sharps + num_flats
   end
 
-  alias_method :sharps_and_flats, :signs
-  alias_method :accidentals, :signs
+  def alterations
+    flats.any? ? (double_flats + flats) : (double_sharps + sharps)
+  end
+
+  alias_method :sharps_and_flats, :alterations
+  alias_method :accidentals, :alterations
 
   def name
     [tonic_spelling, scale_type].join(" ")
   end
 
   def ==(other)
-    signs == self.class.get(other).signs
+    alterations == self.class.get(other).alterations
   end
 
   def to_s
@@ -93,38 +97,12 @@ class HeadMusic::KeySignature
   end
 
   def enharmonic_equivalent?(other)
-    other = KeySignature.get(other)
-    enharmonic_equivalence.equivalent?(other)
+    enharmonic_equivalence.enharmonic_equivalent?(other)
   end
 
   private
 
   def enharmonic_equivalence
-    @enharmonic_equivalence ||= EnharmonicEquivalence.get(self)
-  end
-
-  # Key signatures are enharmonic when all pitch classes in one are respellings of the pitch classes in the other.
-  class EnharmonicEquivalence
-    def self.get(key_signature)
-      key_signature = HeadMusic::KeySignature.get(key_signature)
-      @enharmonic_equivalences ||= {}
-      @enharmonic_equivalences[key_signature.to_s] ||= new(key_signature)
-    end
-
-    attr_reader :key_signature
-
-    def initialize(key_signature)
-      @key_signature = HeadMusic::KeySignature.get(key_signature)
-    end
-
-    def enharmonic_equivalent?(other)
-      other = HeadMusic::KeySignature.get(other)
-      (key_signature.signs | other.signs).map(&:to_s).uniq.length == 12
-    end
-
-    alias_method :enharmonic?, :enharmonic_equivalent?
-    alias_method :equivalent?, :enharmonic_equivalent?
-
-    private_class_method :new
+    @enharmonic_equivalence ||= HeadMusic::KeySignature::EnharmonicEquivalence.get(self)
   end
 end

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

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

data/lib/head_music.rb

@@ -46,6 +46,7 @@ require "head_music/instrument/staff_scheme"
 require "head_music/instrument/staff"
 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: 6.0.1
 platform: ruby
 authors:
 - Rob Head
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-29 00:00:00.000000000 Z
+date: 2023-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -144,6 +144,7 @@ files:
 - 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