head_music 0.27.0 → 0.28.0

data/lib/head_music/style/guidelines/prefer_imperfect.rb

@@ -5,7 +5,7 @@ module HeadMusic::Style::Guidelines; end
 
 # A counterpoint guideline
 class HeadMusic::Style::Guidelines::PreferImperfect < HeadMusic::Style::Annotation
-  MESSAGE = 'Prefer imperfect harmonic intervals.'
+  MESSAGE = "Prefer imperfect harmonic intervals."
 
   def marks
     HeadMusic::Style::Mark.for_all(perfect_intervals.map(&:notes).flatten) if ratio_of_perfect_intervals >= 0.5

data/lib/head_music/style/guidelines/prepare_octave_leaps.rb

@@ -5,7 +5,7 @@ module HeadMusic::Style::Guidelines; end
 
 # A counterpoint guideline
 class HeadMusic::Style::Guidelines::PrepareOctaveLeaps < HeadMusic::Style::Annotation
-  MESSAGE = 'Enter and exit an octave leap from within.'
+  MESSAGE = "Enter and exit an octave leap from within."
 
   def marks
     (external_entries + external_exits + octave_ending).map do |trouble_spot|

data/lib/head_music/style/guidelines/recover_large_leaps.rb

@@ -8,7 +8,7 @@ module HeadMusic::Style::Guidelines; end
 # unless another leap (in either direction) creates a consonant triad.
 # - Brian
 class HeadMusic::Style::Guidelines::RecoverLargeLeaps < HeadMusic::Style::Annotation
-  MESSAGE = 'Recover large leaps by step in the opposite direction.'
+  MESSAGE = "Recover large leaps by step in the opposite direction."
 
   def marks
     melodic_intervals.each_cons(3).map do |intervals|

data/lib/head_music/style/guidelines/singable_intervals.rb

@@ -8,7 +8,7 @@ class HeadMusic::Style::Guidelines::SingableIntervals < HeadMusic::Style::Annota
   PERMITTED_ASCENDING = %w[PU m2 M2 m3 M3 P4 P5 m6 P8].freeze
   PERMITTED_DESCENDING = %w[PU m2 M2 m3 M3 P4 P5 P8].freeze
 
-  MESSAGE = 'Use only PU, m2, M2, m3, M3, P4, P5, m6 (ascending), P8 in the melodic line.'
+  MESSAGE = "Use only PU, m2, M2, m3, M3, P4, P5, m6 (ascending), P8 in the melodic line."
 
   def marks
     melodic_intervals.reject { |interval| permitted?(interval) }.map do |unpermitted_interval|

data/lib/head_music/style/guidelines/singable_range.rb

@@ -7,7 +7,7 @@ module HeadMusic::Style::Guidelines; end
 class HeadMusic::Style::Guidelines::SingableRange < HeadMusic::Style::Annotation
   MAXIMUM_RANGE = 10
 
-  MESSAGE = 'Limit melodic range to a 10th.'
+  MESSAGE = "Limit melodic range to a 10th."
 
   def marks
     HeadMusic::Style::Mark.for_each(extremes, fitness: HeadMusic::PENALTY_FACTOR**overage) if overage.positive?

data/lib/head_music/style/guidelines/single_large_leaps.rb

@@ -5,7 +5,7 @@ module HeadMusic::Style::Guidelines; end
 
 # A counterpoint guideline
 class HeadMusic::Style::Guidelines::SingleLargeLeaps < HeadMusic::Style::Guidelines::RecoverLargeLeaps
-  MESSAGE = 'Recover leaps by step, repetition, opposite direction, or spelling triad.'
+  MESSAGE = "Recover leaps by step, repetition, opposite direction, or spelling triad."
 
   private
 

data/lib/head_music/style/guidelines/start_on_perfect_consonance.rb

@@ -5,7 +5,7 @@ module HeadMusic::Style::Guidelines; end
 
 # marks the voice if the first note is not the first or fifth scale degree of the key.
 class HeadMusic::Style::Guidelines::StartOnPerfectConsonance < HeadMusic::Style::Annotation
-  MESSAGE = 'Start on the tonic or a perfect consonance above the tonic (unless bass voice).'
+  MESSAGE = "Start on the tonic or a perfect consonance above the tonic (unless bass voice)."
 
   def marks
     return unless first_note && ((bass_voice? && !starts_on_tonic?) || !starts_on_perfect_consonance?)

data/lib/head_music/style/guidelines/start_on_tonic.rb

@@ -5,7 +5,7 @@ module HeadMusic::Style::Guidelines; end
 
 # A counterpoint guideline
 class HeadMusic::Style::Guidelines::StartOnTonic < HeadMusic::Style::Annotation
-  MESSAGE = 'Start on the first scale degree.'
+  MESSAGE = "Start on the first scale degree."
 
   def marks
     HeadMusic::Style::Mark.for(first_note) if first_note && !starts_on_tonic?

data/lib/head_music/style/guidelines/step_down_to_final_note.rb

@@ -5,7 +5,7 @@ module HeadMusic::Style::Guidelines; end
 
 # A counterpoint guideline
 class HeadMusic::Style::Guidelines::StepDownToFinalNote < HeadMusic::Style::Annotation
-  MESSAGE = 'Step down to the final note.'
+  MESSAGE = "Step down to the final note."
 
   def marks
     return if last_melodic_interval.nil?
@@ -13,7 +13,7 @@ class HeadMusic::Style::Guidelines::StepDownToFinalNote < HeadMusic::Style::Anno
     fitness = 1
     fitness *= HeadMusic::PENALTY_FACTOR unless step?
     fitness *= HeadMusic::PENALTY_FACTOR unless descending?
-    HeadMusic::Style::Mark.for_all(notes[-2..-1], fitness: fitness) if fitness < 1
+    HeadMusic::Style::Mark.for_all(notes[-2..], fitness: fitness) if fitness < 1
   end
 
   private

data/lib/head_music/style/guidelines/step_out_of_unison.rb

@@ -5,7 +5,7 @@ module HeadMusic::Style::Guidelines; end
 
 # A counterpoint guideline
 class HeadMusic::Style::Guidelines::StepOutOfUnison < HeadMusic::Style::Annotation
-  MESSAGE = 'Exit a unison by step.'
+  MESSAGE = "Exit a unison by step."
 
   def marks
     leaps_following_unisons.map do |skip|

data/lib/head_music/style/guidelines/step_to_final_note.rb

@@ -5,10 +5,10 @@ module HeadMusic::Style::Guidelines; end
 
 # A counterpoint guideline
 class HeadMusic::Style::Guidelines::StepToFinalNote < HeadMusic::Style::Annotation
-  MESSAGE = 'Step to the final note.'
+  MESSAGE = "Step to the final note."
 
   def marks
-    HeadMusic::Style::Mark.for_all(notes[-2..-1]) unless step_to_final_note?
+    HeadMusic::Style::Mark.for_all(notes[-2..]) unless step_to_final_note?
   end
 
   private

data/lib/head_music/style/guidelines/step_up_to_final_note.rb

@@ -5,7 +5,7 @@ module HeadMusic::Style::Guidelines; end
 
 # A counterpoint guideline
 class HeadMusic::Style::Guidelines::StepUpToFinalNote < HeadMusic::Style::Annotation
-  MESSAGE = 'Step up to final note.'
+  MESSAGE = "Step up to final note."
 
   def marks
     return if last_melodic_interval.nil?
@@ -13,7 +13,7 @@ class HeadMusic::Style::Guidelines::StepUpToFinalNote < HeadMusic::Style::Annota
     fitness = 1
     fitness *= HeadMusic::PENALTY_FACTOR unless step?
     fitness *= HeadMusic::PENALTY_FACTOR unless ascending?
-    HeadMusic::Style::Mark.for_all(notes[-2..-1], fitness: fitness) if fitness < 1
+    HeadMusic::Style::Mark.for_all(notes[-2..], fitness: fitness) if fitness < 1
   end
 
   private

data/lib/head_music/style/guidelines/up_to_fourteen_notes.rb

@@ -7,10 +7,10 @@ module HeadMusic::Style::Guidelines; end
 class HeadMusic::Style::Guidelines::UpToFourteenNotes < HeadMusic::Style::Annotation
   MAXIMUM_NOTES = 14
 
-  MESSAGE = 'Write up to fourteen notes.'
+  MESSAGE = "Write up to fourteen notes."
 
   def marks
-    HeadMusic::Style::Mark.for_each(notes[MAXIMUM_NOTES..-1]) if overage.positive?
+    HeadMusic::Style::Mark.for_each(notes[MAXIMUM_NOTES..]) if overage.positive?
   end
 
   private

data/lib/head_music/style/guides/first_species_harmony.rb

@@ -13,10 +13,18 @@ class HeadMusic::Style::Guides::FirstSpeciesHarmony
     HeadMusic::Style::Guidelines::NoUnisonsInMiddle,
     HeadMusic::Style::Guidelines::OneToOne,
     HeadMusic::Style::Guidelines::PreferContraryMotion,
-    HeadMusic::Style::Guidelines::PreferImperfect,
+    HeadMusic::Style::Guidelines::PreferImperfect
   ].freeze
 
   def self.analyze(voice)
     RULESET.map { |rule| rule.new(voice) }
   end
 end
+
+# TODO: Guideline against leaping into P8 even by contrary motion.
+# TODO: Guideline allowing oblique motion < ~15% of the time.
+# TODO: Guideline against battuta (10-8 not at cadence, unless 10-8-6 voice exchange)
+# TODO: 16th C: No M6 leaps. m6 leaps ascending only.
+# TODO: 16th C (?): Avoid perfect consonances on consecutive downbeats
+# TODO: 16th C: No 5-7-1 ending
+# TODO: 16th C Cantus Firmus: Raise the 7 in the cadence, except in Phrygian

data/lib/head_music/style/guides/first_species_melody.rb

@@ -19,7 +19,7 @@ class HeadMusic::Style::Guides::FirstSpeciesMelody
     HeadMusic::Style::Guidelines::SingableRange,
     HeadMusic::Style::Guidelines::StartOnPerfectConsonance,
     HeadMusic::Style::Guidelines::StepOutOfUnison,
-    HeadMusic::Style::Guidelines::StepUpToFinalNote,
+    HeadMusic::Style::Guidelines::StepUpToFinalNote
   ].freeze
 
   def self.analyze(voice)

data/lib/head_music/style/guides/fux_cantus_firmus.rb

@@ -21,7 +21,7 @@ class HeadMusic::Style::Guides::FuxCantusFirmus
     HeadMusic::Style::Guidelines::SingableRange,
     HeadMusic::Style::Guidelines::StartOnTonic,
     HeadMusic::Style::Guidelines::StepDownToFinalNote,
-    HeadMusic::Style::Guidelines::UpToFourteenNotes,
+    HeadMusic::Style::Guidelines::UpToFourteenNotes
   ].freeze
 
   def self.analyze(voice)

data/lib/head_music/style/guides/modern_cantus_firmus.rb

@@ -22,7 +22,7 @@ class HeadMusic::Style::Guides::ModernCantusFirmus
     HeadMusic::Style::Guidelines::SingleLargeLeaps,
     HeadMusic::Style::Guidelines::StartOnTonic,
     HeadMusic::Style::Guidelines::StepToFinalNote,
-    HeadMusic::Style::Guidelines::UpToFourteenNotes,
+    HeadMusic::Style::Guidelines::UpToFourteenNotes
   ].freeze
 
   def self.analyze(voice)

data/lib/head_music/style/mark.rb

@@ -33,7 +33,7 @@ class HeadMusic::Style::Mark
   end
 
   def code
-    [start_position, end_position].join(' to ')
+    [start_position, end_position].join(" to ")
   end
 
   def to_s

data/lib/head_music/utilities/hash_key.rb

@@ -6,6 +6,6 @@ module HeadMusic::Utilities; end
 # Util for converting an object to a consistent hash key
 module HeadMusic::Utilities::HashKey
   def self.for(identifier)
-    I18n.transliterate(identifier.to_s).downcase.gsub(/\W+/, '_').to_sym
+    I18n.transliterate(identifier.to_s).downcase.gsub(/\W+/, "_").to_sym
   end
 end

data/lib/head_music/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HeadMusic
-  VERSION = '0.27.0'
+  VERSION = "0.28.0"
 end

data/lib/head_music.rb

@@ -7,16 +7,16 @@ module HeadMusic
   SMALL_PENALTY_FACTOR = GOLDEN_RATIO_INVERSE**0.5
 end
 
-require 'head_music/version'
+require "head_music/version"
 
-require 'active_support/core_ext/module/delegation'
-require 'active_support/core_ext/string/access'
-require 'humanize'
-require 'i18n'
-require 'i18n/backend/fallbacks'
+require "active_support/core_ext/module/delegation"
+require "active_support/core_ext/string/access"
+require "humanize"
+require "i18n"
+require "i18n/backend/fallbacks"
 
 I18n::Backend::Simple.include I18n::Backend::Fallbacks
-I18n.load_path << Dir[File.join(File.dirname(__dir__), 'lib', 'head_music', 'locales', '*.yml')]
+I18n.load_path << Dir[File.join(File.dirname(__dir__), "lib", "head_music", "locales", "*.yml")]
 I18n.config.available_locales = %i[en fr de it ru es en_US en_GB]
 I18n.default_locale = :en
 I18n.fallbacks[:de] = %i[de en_GB en]
@@ -28,99 +28,99 @@ I18n.fallbacks[:it] = %i[it en_GB en]
 I18n.fallbacks[:ru] = %i[ru en_GB en]
 
 # utilities
-require 'head_music/utilities/hash_key'
+require "head_music/utilities/hash_key"
 
 # modules
-require 'head_music/named'
+require "head_music/named"
 
 # rudiments
-require 'head_music/chromatic_interval'
-require 'head_music/circle'
-require 'head_music/clef'
-require 'head_music/consonance'
-require 'head_music/diatonic_interval'
-require 'head_music/grand_staff'
-require 'head_music/harmonic_interval'
-require 'head_music/instrument'
-require 'head_music/interval_cycle'
-require 'head_music/key_signature'
-require 'head_music/letter_name'
-require 'head_music/melodic_interval'
-require 'head_music/meter'
-require 'head_music/motion'
-require 'head_music/musical_symbol'
-require 'head_music/pitch'
-require 'head_music/pitch/enharmonic_equivalence'
-require 'head_music/pitch/octave_equivalence'
-require 'head_music/pitch_class'
-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'
-require 'head_music/scale_degree'
-require 'head_music/scale_type'
-require 'head_music/sign'
-require 'head_music/solmization'
-require 'head_music/sonority'
-require 'head_music/spelling'
-require 'head_music/staff'
-require 'head_music/tuning'
+require "head_music/chromatic_interval"
+require "head_music/circle"
+require "head_music/clef"
+require "head_music/consonance"
+require "head_music/diatonic_interval"
+require "head_music/grand_staff"
+require "head_music/harmonic_interval"
+require "head_music/instrument"
+require "head_music/interval_cycle"
+require "head_music/key_signature"
+require "head_music/letter_name"
+require "head_music/melodic_interval"
+require "head_music/meter"
+require "head_music/motion"
+require "head_music/musical_symbol"
+require "head_music/pitch"
+require "head_music/pitch/enharmonic_equivalence"
+require "head_music/pitch/octave_equivalence"
+require "head_music/pitch_class"
+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"
+require "head_music/scale_degree"
+require "head_music/scale_type"
+require "head_music/sign"
+require "head_music/solmization"
+require "head_music/sonority"
+require "head_music/spelling"
+require "head_music/staff"
+require "head_music/tuning"
 
 # content
-require 'head_music/content/bar'
-require 'head_music/content/composition'
-require 'head_music/content/note'
-require 'head_music/content/placement'
-require 'head_music/content/position'
-require 'head_music/content/rhythmic_value'
-require 'head_music/content/voice'
+require "head_music/content/bar"
+require "head_music/content/composition"
+require "head_music/content/note"
+require "head_music/content/placement"
+require "head_music/content/position"
+require "head_music/content/rhythmic_value"
+require "head_music/content/voice"
 
 # analysis
-require 'head_music/style/analysis'
-require 'head_music/style/annotation'
-require 'head_music/style/mark'
+require "head_music/style/analysis"
+require "head_music/style/annotation"
+require "head_music/style/mark"
 
 # guidelines
-require 'head_music/style/guidelines/always_move'
-require 'head_music/style/guidelines/approach_perfection_contrarily'
-require 'head_music/style/guidelines/at_least_eight_notes'
-require 'head_music/style/guidelines/avoid_crossing_voices'
-require 'head_music/style/guidelines/avoid_overlapping_voices'
-require 'head_music/style/guidelines/consonant_climax'
-require 'head_music/style/guidelines/consonant_downbeats'
-require 'head_music/style/guidelines/diatonic'
-require 'head_music/style/guidelines/direction_changes'
-require 'head_music/style/guidelines/end_on_perfect_consonance'
-require 'head_music/style/guidelines/end_on_tonic'
-require 'head_music/style/guidelines/frequent_direction_changes'
-require 'head_music/style/guidelines/limit_octave_leaps'
-require 'head_music/style/guidelines/moderate_direction_changes'
-require 'head_music/style/guidelines/mostly_conjunct'
-require 'head_music/style/guidelines/notes_same_length'
-require 'head_music/style/guidelines/no_rests'
-require 'head_music/style/guidelines/no_unisons_in_middle'
-require 'head_music/style/guidelines/one_to_one'
-require 'head_music/style/guidelines/prefer_contrary_motion'
-require 'head_music/style/guidelines/prefer_imperfect'
-require 'head_music/style/guidelines/prepare_octave_leaps'
-require 'head_music/style/guidelines/recover_large_leaps'
-require 'head_music/style/guidelines/singable_intervals'
-require 'head_music/style/guidelines/singable_range'
-require 'head_music/style/guidelines/single_large_leaps'
-require 'head_music/style/guidelines/start_on_perfect_consonance'
-require 'head_music/style/guidelines/start_on_tonic'
-require 'head_music/style/guidelines/step_down_to_final_note'
-require 'head_music/style/guidelines/step_out_of_unison'
-require 'head_music/style/guidelines/step_to_final_note'
-require 'head_music/style/guidelines/step_up_to_final_note'
-require 'head_music/style/guidelines/up_to_fourteen_notes'
+require "head_music/style/guidelines/always_move"
+require "head_music/style/guidelines/approach_perfection_contrarily"
+require "head_music/style/guidelines/at_least_eight_notes"
+require "head_music/style/guidelines/avoid_crossing_voices"
+require "head_music/style/guidelines/avoid_overlapping_voices"
+require "head_music/style/guidelines/consonant_climax"
+require "head_music/style/guidelines/consonant_downbeats"
+require "head_music/style/guidelines/diatonic"
+require "head_music/style/guidelines/direction_changes"
+require "head_music/style/guidelines/end_on_perfect_consonance"
+require "head_music/style/guidelines/end_on_tonic"
+require "head_music/style/guidelines/frequent_direction_changes"
+require "head_music/style/guidelines/limit_octave_leaps"
+require "head_music/style/guidelines/moderate_direction_changes"
+require "head_music/style/guidelines/mostly_conjunct"
+require "head_music/style/guidelines/notes_same_length"
+require "head_music/style/guidelines/no_rests"
+require "head_music/style/guidelines/no_unisons_in_middle"
+require "head_music/style/guidelines/one_to_one"
+require "head_music/style/guidelines/prefer_contrary_motion"
+require "head_music/style/guidelines/prefer_imperfect"
+require "head_music/style/guidelines/prepare_octave_leaps"
+require "head_music/style/guidelines/recover_large_leaps"
+require "head_music/style/guidelines/singable_intervals"
+require "head_music/style/guidelines/singable_range"
+require "head_music/style/guidelines/single_large_leaps"
+require "head_music/style/guidelines/start_on_perfect_consonance"
+require "head_music/style/guidelines/start_on_tonic"
+require "head_music/style/guidelines/step_down_to_final_note"
+require "head_music/style/guidelines/step_out_of_unison"
+require "head_music/style/guidelines/step_to_final_note"
+require "head_music/style/guidelines/step_up_to_final_note"
+require "head_music/style/guidelines/up_to_fourteen_notes"
 
 # guides
-require 'head_music/style/guides/fux_cantus_firmus'
-require 'head_music/style/guides/modern_cantus_firmus'
-require 'head_music/style/guides/first_species_melody'
-require 'head_music/style/guides/first_species_harmony'
+require "head_music/style/guides/fux_cantus_firmus"
+require "head_music/style/guides/modern_cantus_firmus"
+require "head_music/style/guides/first_species_melody"
+require "head_music/style/guides/first_species_harmony"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: head_music
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.28.0
 platform: ruby
 authors:
 - Rob Head
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-23 00:00:00.000000000 Z
+date: 2023-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -233,7 +219,7 @@ homepage: https://github.com/roberthead/head_music
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -248,8 +234,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: The rudiments of western music theory.
 test_files: []