head_music 6.0.1 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64230af5264efb58e93a127cc3ad7528f9fd33f663b98ba117bb49d746e500ce
-  data.tar.gz: c6c72eb473869b2aa01dc80f37d54787dda8816f0ac46404d365ee30431f6eab
+  metadata.gz: 389a01e3f1ee98f5fed32a8fc0ade9c62d0ac3b8e19862bceed574939a2fd9c4
+  data.tar.gz: 639b5a1a4626e5aa00344933a2933bb3d9f50af4c23b64a406a348a80e7d4095
 SHA512:
-  metadata.gz: c049302d49e156b572c3dc0aeb8b9cf59db93ec77ca0e0636c4a64375e4c5648a886ec21ec3e63077981c938317841989df0825c153848aef45b16b13117df2a
-  data.tar.gz: 4dddb70eeb88d7ae04f4184365c791d650731524c2d35c6a300b22227bc24fba921c9efa3d6fa9a0212a7a4f43e2680a0c0cdfbbcc580b11ea17bc9e39ebc4be
+  metadata.gz: 613ba46bebdb8072897e7512820a2faa89aff68e38f6a4dc5473432279556e6791fd4820a958ee139f9c11637d22d5523c0feee911588b08550b1fb284bd78b4
+  data.tar.gz: e49101f5776171b68725e0004bbe6f4026e46b896f1dedd20c9b02219493f6f7ad57dfbcc84546489595b0db3a8294234f36ed71c37b41adc14ce33f903ff355

data/.rubocop.yml

@@ -25,5 +25,8 @@ RSpec/ContextWording:
     - for
     - by
 
+RSpec/MultipleExpectations:
+  Enabled: false
+
 RSpec/NestedGroups:
   Max: 5

data/lib/head_music/consonance.rb

@@ -9,7 +9,7 @@ class HeadMusic::Consonance
 
   attr_reader :name
 
-  delegate :to_s, to: :name
+  delegate :to_s, :to_sym, to: :name
 
   def initialize(name)
     @name = name.to_s.to_sym

data/lib/head_music/content/composition.rb

@@ -46,7 +46,7 @@ class HeadMusic::Content::Composition
   end
 
   def latest_bar_number
-    [voices.map(&:earliest_bar_number), 1].flatten.max
+    [voices.map(&:latest_bar_number), 1].flatten.max
   end
 
   def cantus_firmus_voice
@@ -58,7 +58,7 @@ class HeadMusic::Content::Composition
   end
 
   def to_s
-    "#{name} — #{voices.count} voice(s)"
+    "#{name} — #{voices.count} #{(voices.count == 1) ? "voice" : "voices"}"
   end
 
   private
@@ -71,6 +71,7 @@ class HeadMusic::Content::Composition
   end
 
   def last_meter_change(bar_number)
+    bar_number = [bar_number, earliest_bar_number].max
     bars(bar_number)[earliest_bar_number..bar_number].reverse.detect(&:meter)
   end
 

data/lib/head_music/content/position.rb

@@ -27,10 +27,6 @@ class HeadMusic::Content::Position
     [bar_number, count, tick_string].join(":")
   end
 
-  def state
-    [composition.name, code].join(" ")
-  end
-
   def values
     [bar_number, count, tick]
   end

data/lib/head_music/data/instrument_families.yml

@@ -165,6 +165,7 @@ saxophone:
     - single_reed
     - wind
     - woodwind
+  orchestra_section_key: woodwind
 snare_drum:
   classification_keys:
     - percussion