musicality 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2ca1d5317ab9f47ee4a5a48391c529b6db3dc80
-  data.tar.gz: 61306cd02de6089beb8ebfd71617cefbafb7a1ee
+  metadata.gz: 0d3af3d687ff5109e122bfa208ee1d566bc97674
+  data.tar.gz: 2d819234281b8639e5bb8dd58fcc4e1acb2c3834
 SHA512:
-  metadata.gz: 48c4022b31b8fede1ecf3ae7d8a0f5ee574d02cb7c46863e746d2df11ce0a5f7eec568df3180742202c2ae11d0885c34a8df07c68d43bf17aa1af13fbeecc001
-  data.tar.gz: f4ef016ba31054de3de408c1952e2e8d8319c7d09b6faa6dbd72d166636ac7a4fafa1c2e3ffbbf996d3edff397cdbf808d3406bdb62631994d8dc4a5100f3228
+  metadata.gz: a3f3dd479c5350582fbe1ff5183dd25ae006e8fa9028d071da12123d1192adfe938dea47c4705fd4c95c192c6f34abf1cf37e473ef1d1e726631dbd375d1154e
+  data.tar.gz: 2cf2328e11b1f5b998483c894460e95582e4635c979b310840d0a02c272beadf7bb0f53f01d74b2edca2cc6fe7f57886053d53e971ca1674d7121c737f778ecd

data/ChangeLog.md

@@ -1,4 +1,10 @@
-### 0.8.0 / 2016-01-01
+### 0.10.0 / 2016-01-08
+* Remove uneeded gem dependency
+* Treat all offsets and durations in Score::Tempo as note offsets. Don't check if meter change offsets are integer anymore.
+* Remove triplet marks. Determine if note is triplet based on duration.
+* Make project 'scores' selector glob configurable in config.yml and as an ENV
+
+### 0.9.0 / 2016-01-01
 * Require ruby v2.0 or greater.
 * Remove Score::Unmeasured and change Score::Measured to Score::Tempo
 * Add more convenience methods for note creation, and alter their interface to take a variable number of args, each being interpreted as a pitch group (which may also be a single pitch)

data/lib/musicality.rb

@@ -59,7 +59,6 @@ require 'musicality/notation/util/value_computer'
 require 'musicality/notation/conversion/tempo_conversion'
 require 'musicality/notation/conversion/change_conversion'
 require 'musicality/notation/conversion/note_time_converter'
-require 'musicality/notation/conversion/measure_note_map'
 require 'musicality/notation/conversion/score_converter'
 require 'musicality/notation/conversion/score_conversion'
 

data/lib/musicality/composition/dsl/score_methods.rb

@@ -23,14 +23,13 @@ class Score
   def notes part_notes
     raise ArgumentError, "No part notes given" if part_notes.empty?
 
-    durs = part_notes.values.map {|notes| notes.map {|n| n.duration }.inject(0,:+) }
-    durs_uniq = durs.uniq
+    durs_uniq = part_notes.values.map do |notes|
+      notes.map {|n| n.duration }.inject(0,:+)
+    end.uniq
     raise DurationMismatchError, "New part note durations do not all match" if durs_uniq.size > 1
     dur = durs_uniq.first
-    raise NonPositiveError, "Part note durations are not positive" if dur <= 0
 
-    a = self.duration
-    starting_part_dur = self.max_part_duration
+    a = starting_part_dur = self.duration
     part_notes.each do |part,notes|
       unless parts.has_key? part
         parts[part] = Part.new DEFAULT_START_DYNAMIC
@@ -46,7 +45,7 @@ class Score
 
     b = self.duration
     program.push a...b
-    a...b    
+    a...b
   end
 
   def dynamic_change new_dynamic, transition_dur: 0, offset: 0

data/lib/musicality/notation/conversion/score_conversion.rb

@@ -2,27 +2,12 @@ module Musicality
 
 class Score
   class Tempo < Score
-    # Convert to timed score by converting measure-based offsets and note-based
-    # durations to time-based. This eliminates the use of meters and tempos.
+    # Convert to timed score by converting note-based offsets and durations 
+    # to time-based. This eliminates the use of meters and tempos.
     def to_timed tempo_sample_rate
       ScoreConverter.new(self, tempo_sample_rate).convert_score
     end
-    
-    def measure_note_map
-      Conversion::measure_note_map(measure_offsets,measure_durations)
-    end
-
-    def measure_offsets
-      moffs = Set.new([0.to_r])
-      @tempo_changes.each {|moff,change| moffs += change.offsets(moff) }
-      moffs += @meter_changes.keys
-      @parts.values.each do |part|
-        part.dynamic_changes.each {|moff,change| moffs += change.offsets(moff) }
-      end
-      moffs += @program.map {|seg| [seg.first, seg.last] }.flatten
-      return moffs.sort
-    end
-  
+      
     def beat_durations
       bdurs = @meter_changes.map do |offset,change_or_meter|
         if change_or_meter.is_a? Meter
@@ -38,22 +23,6 @@ class Score
     
       return Hash[ bdurs ]
     end
-    
-    def measure_durations
-      mdurs = @meter_changes.map do |offset,change_or_meter|
-        if change_or_meter.is_a? Meter
-          [ offset, change_or_meter.measure_duration ]
-        else
-          [ offset, change_or_meter.end_value.measure_duration ]
-        end
-      end.sort
-      
-      if mdurs.empty? || mdurs[0][0] != 0
-        mdurs.unshift([0.to_r,@start_meter.measure_duration])
-      end
-    
-      return Hash[ mdurs ]
-    end  
   end
 end
 

data/lib/musicality/notation/conversion/score_converter.rb

@@ -36,26 +36,15 @@ class ScoreConverter
     if score.invalid?
       raise NotValidError, "Errors detected given score: #{score.errors}"
     end
-    mn_map = score.measure_note_map
-    new_parts = Hash[ score.parts.map do |name,part|
-      new_dcs = ScoreConverter.convert_changes(part.dynamic_changes, mn_map)
-      new_notes = part.notes.map {|n| n.clone } # note duration is already note-based
-      new_part = part.clone
-      new_part.notes = new_notes
-      new_part.dynamic_changes = new_dcs
-      [name, new_part]
-    end]      
-    new_program = ScoreConverter.convert_program(score.program, mn_map)
-    new_tempo_changes = ScoreConverter.convert_changes(score.tempo_changes, mn_map)
-    new_beat_durations = Hash[ score.beat_durations.map do |moff,bdur|
-      [mn_map[moff], Change::Immediate.new(bdur) ]
+    beat_duration_changes = Hash[ score.beat_durations.map do |noff,bdur|
+      [noff, Change::Immediate.new(bdur) ]
     end]
-    tempo_computer = ValueComputer.new(score.start_tempo, new_tempo_changes)
-    bdur_computer = ValueComputer.new(score.start_meter.beat_duration, new_beat_durations)
+    tempo_computer = ValueComputer.new(score.start_tempo, score.tempo_changes)
+    bdur_computer = ValueComputer.new(score.start_meter.beat_duration, beat_duration_changes)
     ntc = NoteTimeConverter.new(tempo_computer, bdur_computer, tempo_sample_rate)
 
-    @parts = new_parts
-    @program = new_program
+    @parts = Hash[ score.parts.map {|name,part| [name, part.clone] }]
+    @program = score.program.clone
     @note_time_map = ntc.note_time_map(note_offsets)
   end
   

data/lib/musicality/notation/model/mark.rb

@@ -26,18 +26,6 @@ class Mark
       def ends?; true; end
     end
   end
-
-  class Triplet < Mark
-    class Begin < Triplet
-      def begins?; true; end
-      def ends?; false; end
-    end
-
-    class End < Triplet
-      def begins?; false; end
-      def ends?; true; end
-    end
-  end
 end
 
 end

data/lib/musicality/notation/model/marks.rb

@@ -3,9 +3,6 @@ module Musicality
 module Marks
   BEGIN_SLUR = Mark::Slur::Begin.new
   END_SLUR = Mark::Slur::End.new
-
-  BEGIN_TRIPLET = Mark::Triplet::Begin.new
-  END_TRIPLET = Mark::Triplet::End.new
 end
 
 end

data/lib/musicality/notation/model/note.rb

@@ -75,14 +75,6 @@ class Note
     marks.count {|m| m.is_a?(Mark::Slur::End) } > 0
   end
 
-  def begins_triplet?
-    marks.count {|m| m.is_a?(Mark::Triplet::Begin) } > 0
-  end
-
-  def ends_triplet?
-    marks.count {|m| m.is_a?(Mark::Triplet::End) } > 0
-  end
-
   def to_s
     d = @duration.to_r
     if d.denominator == 1

data/lib/musicality/notation/model/score.rb

@@ -57,7 +57,7 @@ class Score
       @start_key == other.start_key && @key_changes == other.key_changes
   end
   
-  def max_part_duration
+  def duration
     @parts.map {|name,part| part.duration }.max || 0.to_r
   end
   
@@ -66,14 +66,14 @@ class Score
   end
   
   class Timed < Score
-    def seconds_long
-      max_part_duration
-    end
-    alias duration seconds_long
   end
 
   # Tempo-based score with meter, bar lines, and a fixed pulse (beat).
-  # Offsets are measure-based, and tempo values are in beats-per-minute.
+  # 
+  # Offsets and durations are based on note duration, but note duration is
+  # determined by the tempo, which can change.
+  #
+  # Tempo values are in beats-per-minute.
   class Tempo < Score
     attr_accessor :start_tempo, :tempo_changes, :start_meter, :meter_changes
 
@@ -102,34 +102,18 @@ class Score
       @start_meter == other.start_meter &&
       @meter_changes == other.meter_changes
     end
-    
-    def notes_long
-      max_part_duration
-    end
 
-    def measures_long note_dur = self.notes_long
-      noff_end = note_dur
-      noff_prev = 0.to_r
-      moff_prev, mdur_prev = 0.to_r, @start_meter.measure_duration
-      
-      @meter_changes.sort.each do |moff,change|
-        mdur = change.end_value.measure_duration
-        notes_elapsed = mdur_prev * (moff - moff_prev)
-        noff = noff_prev + notes_elapsed
-        
-        if noff >= noff_end
-          break
-        else
-          noff_prev = noff
-        end
-        
-        moff_prev, mdur_prev = moff, mdur
+    # Returns the measure duration of the most recent meter duration since the given note offset,
+    # or of the start meter if there are no meter changes.
+    def measure_duration note_offset = self.duration
+      if meter_changes.any?
+        candidates = meter_changes.select {|noff,change| noff <= note_offset }
+        candidates.max[1].end_value.measure_duration
+      else
+        start_meter.measure_duration
       end
-      return moff_prev + Rational(noff_end - noff_prev, mdur_prev)
     end
 
-    alias duration measures_long
-    
     private
     
     def check_start_tempo
@@ -162,11 +146,6 @@ class Score
         raise TypeError, "Found meter change values that are not Meter objects: #{badtypes}"
       end
 
-      badoffsets = @meter_changes.select {|k,v| k != k.to_i }
-      if badoffsets.any?
-        raise NonIntegerError, "Found meter changes at non-integer offsets: #{badoffsets}"
-      end
-
       nonzero_duration = @meter_changes.select {|k,v| !v.is_a?(Change::Immediate) }
       if nonzero_duration.any?
         raise NonZeroError, "Found meter changes that are not immediate: #{nonzero_duration}"

data/lib/musicality/notation/model/symbols.rb

@@ -20,8 +20,6 @@ LINK_SYMBOLS = {
 MARK_SYMBOLS = {
   Mark::Slur::Begin => "(",
   Mark::Slur::End => ")",
-  Mark::Triplet::Begin => "[",
-  Mark::Triplet::End => "]",
 }
 
 end

data/lib/musicality/notation/parsing/mark_parsing.rb

@@ -69,64 +69,6 @@ module Mark
     r0
   end
 
-  module BeginTriplet0
-    def to_mark; return Musicality::Mark::Triplet::Begin.new; end
-  end
-
-  def _nt_begin_triplet
-    start_index = index
-    if node_cache[:begin_triplet].has_key?(index)
-      cached = node_cache[:begin_triplet][index]
-      if cached
-        node_cache[:begin_triplet][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-        @index = cached.interval.end
-      end
-      return cached
-    end
-
-    if (match_len = has_terminal?("[", false, index))
-      r0 = instantiate_node(SyntaxNode,input, index...(index + match_len))
-      r0.extend(BeginTriplet0)
-      @index += match_len
-    else
-      terminal_parse_failure('"["')
-      r0 = nil
-    end
-
-    node_cache[:begin_triplet][start_index] = r0
-
-    r0
-  end
-
-  module EndTriplet0
-    def to_mark; return Musicality::Mark::Triplet::End.new; end
-  end
-
-  def _nt_end_triplet
-    start_index = index
-    if node_cache[:end_triplet].has_key?(index)
-      cached = node_cache[:end_triplet][index]
-      if cached
-        node_cache[:end_triplet][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-        @index = cached.interval.end
-      end
-      return cached
-    end
-
-    if (match_len = has_terminal?("]", false, index))
-      r0 = instantiate_node(SyntaxNode,input, index...(index + match_len))
-      r0.extend(EndTriplet0)
-      @index += match_len
-    else
-      terminal_parse_failure('"]"')
-      r0 = nil
-    end
-
-    node_cache[:end_triplet][start_index] = r0
-
-    r0
-  end
-
 end
 
 class MarkParser < Treetop::Runtime::CompiledParser

data/lib/musicality/notation/parsing/mark_parsing.treetop

@@ -13,18 +13,6 @@ grammar Mark
       def to_mark; return Musicality::Mark::Slur::End.new; end
     }
   end
-  
-  rule begin_triplet
-    "[" {
-      def to_mark; return Musicality::Mark::Triplet::Begin.new; end
-    }
-  end
-
-  rule end_triplet
-    "]" {
-      def to_mark; return Musicality::Mark::Triplet::End.new; end
-    }
-  end
 end
 
 end

data/lib/musicality/notation/parsing/note_node.rb

@@ -3,46 +3,41 @@ module Parsing
   class NoteNode < Treetop::Runtime::SyntaxNode
     def to_note
       dur = duration.to_r
-
-      if more.empty?
-        return Musicality::Note.new(dur)
-      end
-
       pitches = []
       links = {}
+      articulation = Articulations::NORMAL
 
-      first_pl = more.first_pl
-      more_pl = more.more_pl
+      unless more.empty?
+        first_pl = more.first_pl
+        more_pl = more.more_pl
 
-      pitches.push first_pl.pitch.to_pitch
-      unless first_pl.the_link.empty?
-        links[pitches[-1]] = first_pl.the_link.to_link
-      end
+        pitches.push first_pl.pitch.to_pitch
+        unless first_pl.the_link.empty?
+          links[pitches[-1]] = first_pl.the_link.to_link
+        end
 
-      more_pl.elements.each do |x|
-        pitches.push x.pl.pitch.to_pitch
-        unless x.pl.the_link.empty?
-          links[pitches[-1]] = x.pl.the_link.to_link
+        more_pl.elements.each do |x|
+          pitches.push x.pl.pitch.to_pitch
+          unless x.pl.the_link.empty?
+            links[pitches[-1]] = x.pl.the_link.to_link
+          end
+        end
+
+        unless more.art.empty?
+          articulation = more.art.to_articulation
         end
       end
 
       marks = []
-      unless begin_marks.empty?
-        marks.push begin_marks.first.to_mark
-        unless begin_marks.second.empty?
-          marks.push begin_marks.second.to_mark
-        end
+      unless begin_slur.empty?
+        marks.push Musicality::Marks::BEGIN_SLUR
       end
 
-      unless end_marks.empty?
-        marks.push end_marks.first.to_mark
-        unless end_marks.second.empty?
-          marks.push end_marks.second.to_mark
-        end
+      unless end_slur.empty?
+        marks.push Musicality::Marks::END_SLUR
       end
 
-      Musicality::Note.new(dur, pitches, links: links, marks: marks,
-        articulation: more.art.empty? ? Articulations::NORMAL : more.art.to_articulation)
+      Musicality::Note.new(dur, pitches, links: links, marks: marks, articulation: articulation)
     end
   end
 end