head_music 0.26.2 → 0.26.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f56766ea30e1f634ec3dd587e349f0c86f598434ed4624ce18359b98408f711
-  data.tar.gz: e3ad5ff1c6941a3b19c2753ea5bda86ba112f9439e2444ab55f53d0cd9c7a600
+  metadata.gz: 3224075c2e9f76d778cdbd71942f5bf1496b25c52c56062169824fc3e916f947
+  data.tar.gz: e272fa27e163ca5ea97ceaed10f9098cb196f2ceb45008a89da7837452df6c6e
 SHA512:
-  metadata.gz: 44331e905fb222eae348f9d0933a89d1cccfb5fe144aafff586133a7cfae64e324a27d5b11008cce59a0ad2a9c8adcd3662e9ba69c68872db07d2deed7168afa
-  data.tar.gz: 2c41316ecccfdb2f497cf68b9b4cb74003eb7ea5ddf0b918c6c04b6bd298961d8fa76b971377060c88531da930bae1770ae0a0255825efaaa868df6351d7a4ae
+  metadata.gz: f007ea93b150e2a2f140fadb68d73c978e9ea1481dc0e7590c99f97b5b0fabb9be935adca85b92c86d48179b751aa745fcb81cfa194c7df3d2d0f4ae8282d60f
+  data.tar.gz: 3176231f3a293e9b482fcd7a6708159ca76ed73e8efbec6947fe5779d42fc97cb7850ec07be2d2ae5460bb0e8b88b7b70576e839c59d070707b2a7bbf7f491f0

data/lib/head_music.rb

@@ -49,7 +49,6 @@ require 'head_music/melodic_interval'
 require 'head_music/meter'
 require 'head_music/motion'
 require 'head_music/musical_symbol'
-require 'head_music/octave'
 require 'head_music/pitch'
 require 'head_music/pitch/enharmonic_equivalence'
 require 'head_music/pitch/octave_equivalence'
@@ -58,6 +57,7 @@ require 'head_music/pitch_class_set'
 require 'head_music/pitch_set'
 require 'head_music/quality'
 require 'head_music/reference_pitch'
+require 'head_music/register'
 require 'head_music/rhythm'
 require 'head_music/rhythmic_unit'
 require 'head_music/scale'

data/lib/head_music/diatonic_interval.rb

@@ -304,7 +304,7 @@ class HeadMusic::DiatonicInterval
   def inversion
     inverted_low_pitch = lower_pitch
     while inverted_low_pitch < higher_pitch
-      inverted_low_pitch = HeadMusic::Pitch.fetch_or_create(lower_pitch.spelling, inverted_low_pitch.octave + 1)
+      inverted_low_pitch = HeadMusic::Pitch.fetch_or_create(lower_pitch.spelling, inverted_low_pitch.register + 1)
     end
     HeadMusic::DiatonicInterval.new(higher_pitch, inverted_low_pitch)
   end

data/lib/head_music/pitch.rb

@@ -4,8 +4,7 @@
 class HeadMusic::Pitch
   include Comparable
 
-  attr_reader :spelling
-  attr_reader :octave
+  attr_reader :spelling, :register
 
   delegate :letter_name, to: :spelling
   delegate :series_ascending, :series_descending, to: :letter_name, prefix: true
@@ -51,7 +50,7 @@ class HeadMusic::Pitch
   def self.from_name(name)
     return nil unless name == name.to_s
 
-    fetch_or_create(HeadMusic::Spelling.get(name), HeadMusic::Octave.get(name).to_i)
+    fetch_or_create(HeadMusic::Spelling.get(name), HeadMusic::Register.get(name).to_i)
   end
 
   def self.from_number(number)
@@ -66,7 +65,7 @@ class HeadMusic::Pitch
     sign_interval = natural_letter_pitch.smallest_interval_to(HeadMusic::PitchClass.get(number))
     sign = HeadMusic::Sign.by(:semitones, sign_interval) if sign_interval != 0
     spelling = HeadMusic::Spelling.fetch_or_create(letter_name, sign)
-    fetch_or_create(spelling, natural_letter_pitch.octave)
+    fetch_or_create(spelling, natural_letter_pitch.register)
   end
 
   def self.natural_letter_pitch(number, letter_name)
@@ -76,26 +75,26 @@ class HeadMusic::Pitch
     get(natural_letter_pitch)
   end
 
-  def self.fetch_or_create(spelling, octave = nil)
-    octave ||= HeadMusic::Octave::DEFAULT
-    return unless spelling && (-1..9).cover?(octave)
+  def self.fetch_or_create(spelling, register = nil)
+    register ||= HeadMusic::Register::DEFAULT
+    return unless spelling && (-1..9).cover?(register)
 
     @pitches ||= {}
-    hash_key = [spelling, octave].join
-    @pitches[hash_key] ||= new(spelling, octave)
+    hash_key = [spelling, register].join
+    @pitches[hash_key] ||= new(spelling, register)
   end
 
-  def initialize(spelling, octave)
+  def initialize(spelling, register)
     @spelling = HeadMusic::Spelling.get(spelling.to_s)
-    @octave = octave.to_i
+    @register = register.to_i
   end
 
   def name
-    [spelling, octave].join
+    [spelling, register].join
   end
 
   def midi_note_number
-    (octave + 1) * 12 + letter_name.pitch_class.to_i + sign_semitones.to_i
+    (register + 1) * 12 + letter_name.pitch_class.to_i + sign_semitones.to_i
   end
 
   alias midi midi_note_number
@@ -150,7 +149,7 @@ class HeadMusic::Pitch
   end
 
   def natural_steps(num_steps)
-    HeadMusic::Pitch.get([target_letter_name(num_steps), octave + octaves_delta(num_steps)].join)
+    HeadMusic::Pitch.get([target_letter_name(num_steps), register + octaves_delta(num_steps)].join)
   end
 
   def frequency
@@ -167,7 +166,7 @@ class HeadMusic::Pitch
   private
 
   def octave_changes_to(other)
-    other.octave - octave - octave_adjustment_to(other)
+    other.register - register - octave_adjustment_to(other)
   end
 
   def octave_adjustment_to(other)

data/lib/head_music/pitch/octave_equivalence.rb

@@ -15,7 +15,7 @@ class HeadMusic::Pitch::OctaveEquivalence
 
   def octave_equivalent?(other)
     other = HeadMusic::Pitch.get(other)
-    pitch.spelling == other.spelling && pitch.octave != other.octave
+    pitch.spelling == other.spelling && pitch.register != other.register
   end
 
   alias equivalent? octave_equivalent?

data/lib/head_music/pitch_set.rb

@@ -187,7 +187,7 @@ class HeadMusic::PitchSet
 
   def reduction_pitches
     pitches.map do |pitch|
-      pitch = HeadMusic::Pitch.fetch_or_create(pitch.spelling, pitch.octave - 1) while pitch > bass_pitch + 12
+      pitch = HeadMusic::Pitch.fetch_or_create(pitch.spelling, pitch.register - 1) while pitch > bass_pitch + 12
       pitch
     end.sort
   end

data/lib/head_music/{octave.rb → register.rb}

@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
-# The Octave identifier is a number used in scientific pitch notation.
-class HeadMusic::Octave
+# The register is a numeric octave identifier used in scientific pitch notation.
+#
+# A pitch is a spelling plus a register. For example, C4 is middle C and C5 is the C one octave higher.
+# The number changes between the letter names B and C regardless of sharps and flats,
+# so as an extreme example, Cb5 is actually a semitone below B#4.
+class HeadMusic::Register
   include Comparable
 
   DEFAULT = 4
@@ -14,20 +18,20 @@ class HeadMusic::Octave
     return nil unless identifier.to_s == identifier.to_i.to_s
     return nil unless (-2..12).cover?(identifier.to_i)
 
-    @octaves ||= {}
-    @octaves[identifier.to_i] ||= new(identifier.to_i)
+    @registers ||= {}
+    @registers[identifier.to_i] ||= new(identifier.to_i)
   end
 
   def self.from_name(string)
     return unless string.to_s.match?(HeadMusic::Spelling::MATCHER)
 
-    _letter, _sign, octave_string = string.to_s.match(HeadMusic::Spelling::MATCHER).captures
-    @octaves ||= {}
-    @octaves[octave_string.to_i] ||= new(octave_string.to_i) if octave_string
+    _letter, _sign, register_string = string.to_s.match(HeadMusic::Spelling::MATCHER).captures
+    @registers ||= {}
+    @registers[register_string.to_i] ||= new(register_string.to_i) if register_string
   end
 
   def self.default
-    @octaves[DEFAULT] ||= new(DEFAULT)
+    @registers[DEFAULT] ||= new(DEFAULT)
   end
 
   attr_reader :number

data/lib/head_music/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HeadMusic
-  VERSION = '0.26.2'
+  VERSION = '0.26.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: head_music
 version: !ruby/object:Gem::Version
-  version: 0.26.2
+  version: 0.26.3
 platform: ruby
 authors:
 - Rob Head
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-15 00:00:00.000000000 Z
+date: 2021-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -166,7 +166,6 @@ files:
 - lib/head_music/motion.rb
 - lib/head_music/musical_symbol.rb
 - lib/head_music/named.rb
-- lib/head_music/octave.rb
 - lib/head_music/pitch.rb
 - lib/head_music/pitch/enharmonic_equivalence.rb
 - lib/head_music/pitch/octave_equivalence.rb
@@ -175,6 +174,7 @@ files:
 - lib/head_music/pitch_set.rb
 - lib/head_music/quality.rb
 - lib/head_music/reference_pitch.rb
+- lib/head_music/register.rb
 - lib/head_music/rhythm.rb
 - lib/head_music/rhythmic_unit.rb
 - lib/head_music/scale.rb