head_music 0.29.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ff9ff67c1a33423b012f970f7e5ff244f44fa05c07315cd248d47d206489369
-  data.tar.gz: f94cc84e2c2805f22a1e4f4f08f09182f65c639b7052db18149c1acab3788161
+  metadata.gz: b2535794cd693b001994fe5a74a815c48e6390d98b89ced86ae7102893017e62
+  data.tar.gz: ca961916aa2fd55b1ad8b4ed4cc63aa73e16c28c8ac7affa8670a2eaf4056116
 SHA512:
-  metadata.gz: f34e8f37402764fb6b1dfe407821a4dd0e7ff3f382b0d33319c3c9c958635df312c7cf7b27fdfe35f68795eb8bfd60457d38b2168ff9910dd60f51bb29ad36df
-  data.tar.gz: 12dc1f950956cdf792beb0c530ed78a2cd9301328056d97052566902324b63c21e15cf1a23774d88620a73f7fe0ea42acb593be74ab13915aa16063dd58f6f1d
+  metadata.gz: bec7c67bcdb2f5e7181a3d84d54365ec905e604cde2e3653198a65121cd457f6df79162e2db63499f93e6b02b4e18d34eefa89642b91cea66ea075cd6bc20b82
+  data.tar.gz: a09572d7bee318937385ecbda3b9a5fd98b3713b7bec57dccd4c8d969ed3c7e710446ea4a5490cb632284e3626948849bee8e5a6a710fba6d74ddb53e2f4b781

data/.rubocop.yml

@@ -27,6 +27,3 @@ RSpec/ContextWording:
 
 RSpec/NestedGroups:
   Max: 4
-
-RSpec/FilePath:
-  Enabled: false

data/TODO.md

@@ -1,5 +1,108 @@
 # TODO
 
+May 7, 2023
+
+Robert Head:
+	Hey, Brian. You have a sec for a music question? I’m trying to come up with different terms for the way “family” is used. “Woodwind family” vs. “Oboe family”.
+
+Brian Head:
+	Those are good, I’d say.  In what context?
+
+Robert Head:
+	In my software project, I’m trying to define those relationships. One is a section of the orchestra and the other is species of instrument. But usually people, in my experience, just say “family”.
+	Is there some more precise terminology or adjective that can disambiguate those two terms?
+
+Brian Head:
+	Hmmm. Already “family” is informal. Blatter distinguishes between “choir” and “family” as in the  trumpet family” within the “brass choir”.
+
+Robert Head:
+	Ah, yes! I do like that.
+	But does it apply to percussion?
+	“Section” is another candidate, but that gets used for string parts as well.
+
+Brian Head:
+	Strings and percussion probably don’t think of themselves as a choir, but if you’re mainly looking for a taxonomically consistent word, that’s the feat I can think of at the moment.
+	Section is a good word, too, which easily flows between smaller and larger meanings.
+
+Robert Head:
+	Obviously, the four “families” is a garbage way to classify all instruments and it really is more applicable to the orchestral context, so maybe “orchestra family” or “orchestra section”.
+
+Brian Head:
+	I’d say that “family” is best used at the instrument level, as in “saxophone family”. Choir or section are better for larger collections. Still, both of those words connote membership in an orchestra. Or large ensemble.  “Woodwinds” or “percussion” describe the class of instruments themselves.
+
+Robert Head:
+	Cool
+
+Action Item: Call them orchestra_section
+
+Add Score Order
+
+Orchestral Score Order
+
+# So, in orchestral scores, the groupings are by instrumental 'family':
+# woodwinds on top of the page, and below them, in descending order,
+# brass,
+# percussion,
+# harp and keyboards,
+# soloists (instrumental or vocal),
+# voices,
+# strings
+
+(Notice the different placement of percussion in orchestra and band scores)
+Flutes (Fl or Fls)
+Oboes (Ob or Obs)
+Clarinets (Cl or Cls)
+Bassoons (Bsn or Bsns)
+Horns (Hn or Hns)
+Trumpets (Tpt or Tpts)
+Trombones (Trb or Trbs)
+Tuba (Tuba)
+Timpani (Timp)
+Percussion (Perc)
+Other Instruments
+harp and keyboards
+soloists
+voices
+Violins I (Vlns)
+Violins II
+Viola (Vla)
+Violoncellos (Vcl)
+Double Bass (DB)
+
+Band Score Order
+
+Flutes (Fl or Fls)
+Oboes (Ob or Obs)
+Bassoons (Bsn or Bsns)
+Clarinets (Cl or Cls)
+Saxophones (AS, or TS, or BS)
+Cornets (Cor)
+Trumpets (Tpt or Tpts)
+Horns (Hn or Hns)
+Trombones (Trb or Trbs)
+Euphoniums (Euph)
+Tubas (Tubas)
+Timpani (Timp)
+Percussion (Perc)
+
+Brass Quintet
+
+Trumpet I
+Trumpet II
+Horn
+Trombone
+Tuba
+
+Woodwind Quintet
+
+Flute
+Oboe
+Clarinet
+Horn
+Bassoon
+
+
+
 Disambiguate PitchSet and Sonority
 
 Sonority should be a name for a specific set of intervals
@@ -31,11 +134,12 @@ Make new analysis classes:
 Dyad
   .interval
   .implied_triad (if a third)
+    - returns most likely of possible triads
   .possible_triads
     - returns major and minor if a perfect fifth
     - returns minor and diminished if minor third
     - returns major and augmented if major third
-    - returns augmented if augmented fifth
+    - returns inverted major and root augmented if augmented fifth
     - returns diminished if diminished fifth
     - should it take into account enharmonics? I think yes.
   .possible_seventh_chords

data/lib/head_music/content/bar.rb

@@ -1,8 +1,11 @@
 # frozen_string_literal: true
 
+# A module for musical content
+module HeadMusic::Content; end
+
 # Representation of a bar in a composition
 # Encapsulates meter and key signature changes
-class HeadMusic::Bar
+class HeadMusic::Content::Bar
   attr_reader :composition
   attr_accessor :key_signature, :meter
 

data/lib/head_music/content/composition.rb

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
+# A module for musical content
+module HeadMusic::Content; end
+
 # A composition is musical content.
-class HeadMusic::Composition
+class HeadMusic::Content::Composition
   attr_reader :name, :key_signature, :meter, :voices
 
   def initialize(name: nil, key_signature: nil, meter: nil)
@@ -10,7 +13,7 @@ class HeadMusic::Composition
   end
 
   def add_voice(role: nil)
-    @voices << HeadMusic::Voice.new(composition: self, role: role)
+    @voices << HeadMusic::Content::Voice.new(composition: self, role: role)
     @voices.last
   end
 
@@ -27,7 +30,7 @@ class HeadMusic::Composition
   def bars(last = latest_bar_number)
     @bars ||= []
     (earliest_bar_number..last).each do |bar_number|
-      @bars[bar_number] ||= HeadMusic::Bar.new(self)
+      @bars[bar_number] ||= HeadMusic::Content::Bar.new(self)
     end
     @bars[earliest_bar_number..last]
   end

data/lib/head_music/content/note.rb

@@ -1,22 +1,25 @@
 # frozen_string_literal: true
 
+# A module for musical content
+module HeadMusic::Content; end
+
 # A note is a pitch with a duration.
 #
 # Note quacks like a placement, but requires a different set of construction arguments
 #   - always has a pitch
 #   - receives a voice and position if unspecified
-class HeadMusic::Note
+class HeadMusic::Content::Note
   attr_accessor :pitch, :rhythmic_value, :voice, :position
 
   def initialize(pitch, rhythmic_value, voice = nil, position = nil)
     @pitch = HeadMusic::Pitch.get(pitch)
-    @rhythmic_value = HeadMusic::RhythmicValue.get(rhythmic_value)
-    @voice = voice || HeadMusic::Voice.new
-    @position = position || HeadMusic::Position.new(@voice.composition, "1:1")
+    @rhythmic_value = HeadMusic::Content::RhythmicValue.get(rhythmic_value)
+    @voice = voice || HeadMusic::Content::Voice.new
+    @position = position || HeadMusic::Content::Position.new(@voice.composition, "1:1")
   end
 
   def placement
-    @placement ||= HeadMusic::Placement.new(voice, position, rhythmic_value, pitch)
+    @placement ||= HeadMusic::Content::Placement.new(voice, position, rhythmic_value, pitch)
   end
 
   def to_s

data/lib/head_music/content/placement.rb

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
+# A module for musical content
+module HeadMusic::Content; end
+
 # A placement is a note or rest at a position within a voice in a composition
-class HeadMusic::Placement
+class HeadMusic::Content::Placement
   include Comparable
 
   attr_reader :voice, :position, :rhythmic_value, :pitch
@@ -54,15 +57,15 @@ class HeadMusic::Placement
   def ensure_attributes(voice, position, rhythmic_value, pitch)
     @voice = voice
     ensure_position(position)
-    @rhythmic_value = HeadMusic::RhythmicValue.get(rhythmic_value)
+    @rhythmic_value = HeadMusic::Content::RhythmicValue.get(rhythmic_value)
     @pitch = HeadMusic::Pitch.get(pitch)
   end
 
   def ensure_position(position)
-    @position = if position.is_a?(HeadMusic::Position)
+    @position = if position.is_a?(HeadMusic::Content::Position)
       position
     else
-      HeadMusic::Position.new(composition, position)
+      HeadMusic::Content::Position.new(composition, position)
     end
   end
 end

data/lib/head_music/content/position.rb

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
+# A module for musical content
+module HeadMusic::Content; end
+
 # A position is a moment in time within the rhythmic framework of a composition.
-class HeadMusic::Position
+class HeadMusic::Content::Position
   include Comparable
 
   attr_reader :composition, :bar_number, :count, :tick
@@ -56,7 +59,7 @@ class HeadMusic::Position
   end
 
   def +(other)
-    other = HeadMusic::RhythmicValue.new(other) if [HeadMusic::RhythmicUnit, Symbol, String].include?(other.class)
+    other = HeadMusic::Content::RhythmicValue.new(other) if [HeadMusic::RhythmicUnit, Symbol, String].include?(other.class)
     self.class.new(composition, bar_number, count, tick + other.ticks)
   end
 

data/lib/head_music/content/rhythmic_value.rb

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
+# A module for musical content
+module HeadMusic::Content; end
+
 # A rhythmic value is a duration composed of a rhythmic unit, any number of dots, and a tied value.
-class HeadMusic::RhythmicValue
+class HeadMusic::Content::RhythmicValue
   attr_reader :unit, :dots, :tied_value
 
   delegate :name, to: :unit, prefix: true
@@ -9,7 +12,7 @@ class HeadMusic::RhythmicValue
 
   def self.get(identifier)
     case identifier
-    when HeadMusic::RhythmicValue
+    when HeadMusic::Content::RhythmicValue
       identifier
     when HeadMusic::RhythmicUnit
       new(identifier)

data/lib/head_music/content/voice.rb

@@ -1,8 +1,11 @@
 # frozen_string_literal: true
 
+# A module for musical content
+module HeadMusic::Content; end
+
 # A Voice is a stream of music with some indepedence that is conceptually one part or for one performer.
 # The melodic lines in counterpoint are each a voice.
-class HeadMusic::Voice
+class HeadMusic::Content::Voice
   include Comparable
 
   attr_reader :composition, :placements, :role
@@ -10,13 +13,13 @@ class HeadMusic::Voice
   delegate :key_signature, to: :composition
 
   def initialize(composition: nil, role: nil)
-    @composition = composition || HeadMusic::Composition.new
+    @composition = composition || HeadMusic::Content::Composition.new
     @role = role
     @placements = []
   end
 
   def place(position, rhythmic_value, pitch = nil)
-    HeadMusic::Placement.new(self, position, rhythmic_value, pitch).tap do |placement|
+    HeadMusic::Content::Placement.new(self, position, rhythmic_value, pitch).tap do |placement|
       insert_into_placements(placement)
     end
   end

data/lib/head_music/data/clefs.yml

@@ -22,10 +22,12 @@
 - :pitch: G3
   :line: 2
   :modern: true
-  :name_key: choral_tenor_clef
+  :name_key: vocal_tenor_clef
   :alias_name_keys:
   - tenor_clef
   - tenor_g_clef
+  - g_clef_ottava_bassa
+  - octave_treble_clef
   :symbols:
   - :unicode: "\U0001D120"
     :html_entity: "𝄠"

data/lib/head_music/data/instrument_families.yml

@@ -0,0 +1,229 @@
+---
+accordian:
+  classification_keys:
+    - reed
+    - free-reed
+    - aerophone
+    - keyboard
+    - wind
+  orchestra_section_key: keyboard
+bagpipe:
+  classification_keys:
+    - aerophone
+    - reed
+    - wind
+    - woodwind
+  orchestra_section_key: woodwind
+bassoon:
+  classification_keys:
+    - aerophone
+    - reed
+    - double_reed
+    - wind
+    - woodwind
+  orchestra_section_key: woodwind
+clarinet:
+  classification_keys:
+    - aerophone
+    - reed
+    - single_reed
+    - wind
+    - woodwind
+  orchestra_section_key: woodwind
+clavichord:
+  classification_keys:
+    - chordophone
+    - keyboard
+    - percussion
+    - string
+  orchestra_section_key: keyboard
+cornet:
+  classification_keys:
+    - aerophone
+    - brass
+    - wind
+  orchestra_section_key: brass
+cymbal:
+  classification_keys:
+    - percussion
+    - idiophone
+  orchestra_section_key: percussion
+double_bass:
+  classification_keys:
+    - bowed
+    - chordophone
+    - string
+  orchestra_section_key: string
+flute:
+  classification_keys:
+    - aerophone
+    - edge-blown aerophone
+    - wind
+    - woodwind
+  orchestra_section_key: woodwind
+glockenspiel:
+  classification_keys:
+    - percussion
+    - idiophone
+    - keyboard
+    - struck
+    - metal
+    - mallet
+  orchestra_section_key: percussion
+gong:
+  classification_keys:
+    - percussion
+    - idiophone
+  orchestra_section_key: percussion
+guitar:
+  classification_keys:
+    - chordophone
+    - plucked
+    - string
+  orchestra_section_key: string
+harp:
+  classification_keys:
+    - chordophone
+    - plucked
+    - string
+  orchestra_section_key: string
+harpsichord:
+  classification_keys:
+    - chordophone
+    - keyboard
+    - percussion
+    - string
+  orchestra_section_key: keyboard
+horn:
+  classification_keys:
+    - aerophone
+    - brass
+    - wind
+  orchestra_section_key: brass
+kettledrum:
+  classification_keys:
+    - percussion
+    - membranophone
+  orchestra_section_key: percussion
+lute:
+  classification_keys:
+    - chordophone
+    - plucked
+    - string
+  orchestra_section_key: string
+mandolin:
+  classification_keys:
+    - chordophone
+    - plucked
+    - string
+  orchestra_section_key: string
+marimba:
+  classification_keys:
+    - idiophone
+    - keyboard
+    - percussion
+    - struck
+    - wood
+    - mallet
+  orchestra_section_key: percussion
+oboe:
+  classification_keys:
+    - aerophone
+    - reed
+    - double_reed
+    - wind
+    - woodwind
+  orchestra_section_key: woodwind
+organ:
+  classification_keys:
+    - aerophone
+    - keyboard
+  orchestra_section_key: keyboard
+piano:
+  classification_keys:
+    - chordophone
+    - keyboard
+    - percussion
+    - string
+  orchestra_section_key: keyboard
+recorder:
+  classification_keys:
+    - aerophone
+    - wind
+    - woodwind
+  orchestra_section_key: woodwind
+saxhorn:
+  classification_keys:
+    - aerophone
+    - brass
+    - wind
+  orchestra_section_key: brass
+saxophone:
+  classification_keys:
+    - aerophone
+    - reed
+    - single_reed
+    - wind
+    - woodwind
+snare_drum:
+  classification_keys:
+    - percussion
+    - membranophone
+  orchestra_section_key: percussion
+synthesizer:
+  classification_keys:
+    - electronic
+    - keyboard
+  orchestra_section_key: keyboard
+trombone:
+  classification_keys:
+    - aerophone
+    - brass
+    - wind
+  orchestra_section_key: brass
+trumpet:
+  classification_keys:
+    - aerophone
+    - brass
+    - wind
+  orchestra_section_key: brass
+tuba:
+  classification_keys:
+    - aerophone
+    - brass
+    - wind
+  orchestra_section_key: brass
+vibraphone:
+  classification_keys:
+    - percussion
+    - struck
+    - idiophone
+    - keyboard
+    - mallet
+    - metal
+  orchestra_section_key: percussion
+violin:
+  classification_keys:
+    - bowed
+    - chordophone
+    - string
+  orchestra_section_key: string
+voice:
+  classification_keys:
+    - voice
+  orchestra_section_key: voice
+woodblock:
+  classification_keys:
+    - percussion
+    - struck
+    - idiophone
+  orchestra_section_key: percussion
+xylophone:
+  classification_keys:
+    - percussion
+    - struck
+    - idiophone
+    - keyboard
+    - mallet
+    - wood
+  orchestra_section_key: percussion