music-transcription 0.10.0 → 0.11.0

data/examples/song2.yml

@@ -7,9 +7,6 @@ start_meter: !ruby/object:Music::Transcription::Meter
   measure_duration: !ruby/object:Rational
     denominator: 1
     numerator: 1
-  check_methods:
-  - :check_beats_per_measure
-  - :check_beat_duration
 start_tempo: 120
 meter_changes: {}
 tempo_changes: {}
@@ -17,7 +14,7 @@ parts:
   1: !ruby/object:Music::Transcription::Part
     notes:
     - !ruby/object:Music::Transcription::Note
-      duration: &1 !ruby/object:Rational
+      duration: !ruby/object:Rational
         denominator: 1
         numerator: 1
       pitches:
@@ -27,21 +24,21 @@ parts:
       articulation: :normal
       accented: false
       links: {}
-      check_methods:
-      - :ensure_positive_duration
     - !ruby/object:Music::Transcription::Note
-      duration: *1
+      duration: !ruby/object:Rational
+        denominator: 1
+        numerator: 1
       pitches:
-      - &3 !ruby/object:Music::Transcription::Pitch
+      - !ruby/object:Music::Transcription::Pitch
         octave: 3
         semitone: 10
       articulation: :normal
       accented: false
       links: {}
-      check_methods:
-      - :ensure_positive_duration
     - !ruby/object:Music::Transcription::Note
-      duration: *1
+      duration: !ruby/object:Rational
+        denominator: 1
+        numerator: 1
       pitches:
       - !ruby/object:Music::Transcription::Pitch
         octave: 3
@@ -49,10 +46,8 @@ parts:
       articulation: :normal
       accented: false
       links: {}
-      check_methods:
-      - :ensure_positive_duration
     - !ruby/object:Music::Transcription::Note
-      duration: &2 !ruby/object:Rational
+      duration: !ruby/object:Rational
         denominator: 2
         numerator: 1
       pitches:
@@ -62,22 +57,19 @@ parts:
       articulation: :normal
       accented: false
       links: {}
-      check_methods:
-      - :ensure_positive_duration
     - !ruby/object:Music::Transcription::Note
-      duration: *2
+      duration: !ruby/object:Rational
+        denominator: 2
+        numerator: 1
       pitches:
-      - *3
+      - !ruby/object:Music::Transcription::Pitch
+        octave: 3
+        semitone: 10
       articulation: :normal
       accented: false
       links: {}
-      check_methods:
-      - :ensure_positive_duration
     start_dynamic: 0.625
     dynamic_changes: {}
-    check_methods:
-    - :ensure_start_dynamic
-    - :ensure_dynamic_change_values_range
   2: !ruby/object:Music::Transcription::Part
     notes:
     - !ruby/object:Music::Transcription::Note
@@ -91,200 +83,74 @@ parts:
       articulation: :normal
       accented: false
       links: {}
-      check_methods:
-      - :ensure_positive_duration
     - !ruby/object:Music::Transcription::Note
-      duration: *1
+      duration: !ruby/object:Rational
+        denominator: 1
+        numerator: 1
       pitches:
-      - &5 !ruby/object:Music::Transcription::Pitch
+      - !ruby/object:Music::Transcription::Pitch
         octave: 5
         semitone: 2
       articulation: :normal
       accented: false
       links: {}
-      check_methods:
-      - :ensure_positive_duration
     - !ruby/object:Music::Transcription::Note
-      duration: *1
+      duration: !ruby/object:Rational
+        denominator: 1
+        numerator: 1
       pitches:
-      - &4 !ruby/object:Music::Transcription::Pitch
+      - !ruby/object:Music::Transcription::Pitch
         octave: 5
         semitone: 0
       articulation: :normal
       accented: false
       links: {}
-      check_methods:
-      - :ensure_positive_duration
     - !ruby/object:Music::Transcription::Note
       duration: !ruby/object:Rational
         denominator: 8
         numerator: 5
       pitches:
-      - *4
-      articulation: :normal
-      accented: false
-      links: {}
-      check_methods:
-      - :ensure_positive_duration
-    - !ruby/object:Music::Transcription::Note
-      duration: *2
-      pitches:
-      - *4
-      articulation: :normal
-      accented: false
-      links: {}
-      check_methods:
-      - :ensure_positive_duration
-    - !ruby/object:Music::Transcription::Note
-      duration: *2
-      pitches:
-      - *5
-      articulation: :normal
-      accented: false
-      links: {}
-      check_methods:
-      - :ensure_positive_duration
-    start_dynamic: 0.625
-    dynamic_changes: {}
-    check_methods:
-    - :ensure_start_dynamic
-    - :ensure_dynamic_change_values_range
-  3: !ruby/object:Music::Transcription::Part
-    notes:
-    - !ruby/object:Music::Transcription::Note
-      duration: &9 !ruby/object:Rational
-        denominator: 8
-        numerator: 1
-      pitches: []
-      articulation: :normal
-      accented: false
-      links: {}
-      check_methods:
-      - :ensure_positive_duration
-    - !ruby/object:Music::Transcription::Note
-      duration: &6 !ruby/object:Rational
-        denominator: 4
-        numerator: 1
-      pitches:
       - !ruby/object:Music::Transcription::Pitch
         octave: 5
-        semitone: 7
+        semitone: 0
       articulation: :normal
       accented: false
       links: {}
-      check_methods:
-      - :ensure_positive_duration
     - !ruby/object:Music::Transcription::Note
-      duration: *2
+      duration: !ruby/object:Rational
+        denominator: 2
+        numerator: 1
       pitches:
-      - &7 !ruby/object:Music::Transcription::Pitch
+      - !ruby/object:Music::Transcription::Pitch
         octave: 5
-        semitone: 5
-      articulation: :normal
-      accented: false
-      links: {}
-      check_methods:
-      - :ensure_positive_duration
-    - !ruby/object:Music::Transcription::Note
-      duration: *6
-      pitches: []
-      articulation: :normal
-      accented: false
-      links: {}
-      check_methods:
-      - :ensure_positive_duration
-    - !ruby/object:Music::Transcription::Note
-      duration: *6
-      pitches:
-      - *7
+        semitone: 0
       articulation: :normal
       accented: false
       links: {}
-      check_methods:
-      - :ensure_positive_duration
     - !ruby/object:Music::Transcription::Note
-      duration: *2
+      duration: !ruby/object:Rational
+        denominator: 2
+        numerator: 1
       pitches:
-      - &8 !ruby/object:Music::Transcription::Pitch
+      - !ruby/object:Music::Transcription::Pitch
         octave: 5
-        semitone: 3
-      articulation: :normal
-      accented: false
-      links: {}
-      check_methods:
-      - :ensure_positive_duration
-    - !ruby/object:Music::Transcription::Note
-      duration: *6
-      pitches: []
-      articulation: :normal
-      accented: false
-      links: {}
-      check_methods:
-      - :ensure_positive_duration
-    - !ruby/object:Music::Transcription::Note
-      duration: *6
-      pitches:
-      - *8
-      articulation: :normal
-      accented: false
-      links: {}
-      check_methods:
-      - :ensure_positive_duration
-    - !ruby/object:Music::Transcription::Note
-      duration: *2
-      pitches:
-      - *8
-      articulation: :normal
-      accented: false
-      links: {}
-      check_methods:
-      - :ensure_positive_duration
-    - !ruby/object:Music::Transcription::Note
-      duration: *9
-      pitches: []
-      articulation: :normal
-      accented: false
-      links: {}
-      check_methods:
-      - :ensure_positive_duration
-    - !ruby/object:Music::Transcription::Note
-      duration: *2
-      pitches:
-      - *8
-      articulation: :normal
-      accented: false
-      links: {}
-      check_methods:
-      - :ensure_positive_duration
-    - !ruby/object:Music::Transcription::Note
-      duration: *2
-      pitches:
-      - *7
+        semitone: 2
       articulation: :normal
       accented: false
       links: {}
-      check_methods:
-      - :ensure_positive_duration
     start_dynamic: 0.625
     dynamic_changes: {}
-    check_methods:
-    - :ensure_start_dynamic
-    - :ensure_dynamic_change_values_range
+  3: !ruby/object:Music::Transcription::Part
+    notes: []
+    start_dynamic: 0.625
+    dynamic_changes: {}
 program: !ruby/object:Music::Transcription::Program
   segments:
-    :segments:
-    - !ruby/range
-      begin: 0
-      end: 4.0
-      excl: true
-    - !ruby/range
-      begin: 0
-      end: 4.0
-      excl: true
-  check_methods:
-  - :ensure_increasing_segments
-  - :ensure_nonnegative_segments
-check_methods:
-- :check_start_tempo
-- :check_tempo_changes
-- :check_meter_changes
+  - !ruby/range
+    begin: 0
+    end: 4.0
+    excl: true
+  - !ruby/range
+    begin: 0
+    end: 4.0
+    excl: true

data/lib/music-transcription.rb

@@ -4,19 +4,19 @@ require 'music-transcription/validatable'
 require 'music-transcription/errors'
 
 # code for transcribing (representing) music
-require 'music-transcription/pitch'
-require 'music-transcription/pitches'
-require 'music-transcription/link'
-require 'music-transcription/articulations'
-require 'music-transcription/note'
-require 'music-transcription/dynamics'
-require 'music-transcription/change'
-require 'music-transcription/part'
-require 'music-transcription/program'
-require 'music-transcription/tempo'
-require 'music-transcription/meter'
-require 'music-transcription/meters'
-require 'music-transcription/score'
+require 'music-transcription/model/pitch'
+require 'music-transcription/model/pitches'
+require 'music-transcription/model/link'
+require 'music-transcription/model/articulations'
+require 'music-transcription/model/note'
+require 'music-transcription/model/dynamics'
+require 'music-transcription/model/change'
+require 'music-transcription/model/part'
+require 'music-transcription/model/program'
+require 'music-transcription/model/tempo'
+require 'music-transcription/model/meter'
+require 'music-transcription/model/meters'
+require 'music-transcription/model/score'
 
 require 'treetop'
 require 'music-transcription/parsing/nonnegative_integer_parsing'
@@ -30,4 +30,5 @@ require 'music-transcription/parsing/link_parsing'
 require 'music-transcription/parsing/link_nodes'
 require 'music-transcription/parsing/note_parsing'
 require 'music-transcription/parsing/note_nodes'
+require 'music-transcription/parsing/meter_parsing'
 require 'music-transcription/parsing/convenience_methods'

data/lib/music-transcription/{link.rb → model/link.rb}

@@ -17,6 +17,10 @@ class Link
     def ==(other)
       self.class == other.class
     end
+    
+    def transpose! diff
+      # do nothing, of course
+    end
   end
   
   class TargetedLink < Link
@@ -29,6 +33,10 @@ class Link
     def ==(other)
       self.class == other.class && @target_pitch == other.target_pitch
     end
+    
+    def transpose! diff
+      @target_pitch += diff
+    end
   end
   
   class Glissando < TargetedLink; end

data/lib/music-transcription/{note.rb → model/note.rb}

@@ -50,7 +50,7 @@ class Note
     @pitches = @pitches.map {|pitch| pitch + diff}
     new_links = {}
     @links.each_pair do |k,v|
-      v.target_pitch += diff
+      v.transpose! diff
       new_links[k + diff] = v
     end
     @links = new_links

data/lib/music-transcription/{part.rb → model/part.rb}

@@ -6,7 +6,7 @@ module Transcription
 class Part
   include Validatable
   
-  attr_reader :start_dynamic, :dynamic_changes, :notes
+  attr_accessor :start_dynamic, :dynamic_changes, :notes
   
   @@check_methods = [:ensure_start_dynamic, :ensure_dynamic_change_values_range ]
   def initialize start_dynamic, notes: [], dynamic_changes: {}

data/lib/music-transcription/{score.rb → model/score.rb}

@@ -4,7 +4,7 @@ module Transcription
 class Score
   include Validatable
   
-  attr_reader :start_meter, :start_tempo, :parts, :program, :meter_changes, :tempo_changes
+  attr_accessor :start_meter, :start_tempo, :parts, :program, :meter_changes, :tempo_changes
   
   @@check_methods = [ :check_start_tempo, :check_tempo_changes, :check_meter_changes ]
   def initialize start_meter, start_tempo, meter_changes: {}, tempo_changes: {}, parts: {}, program: Program.new

data/lib/music-transcription/parsing/convenience_methods.rb

@@ -4,6 +4,7 @@ module Parsing
   DURATION_PARSER = DurationParser.new
   PITCH_PARSER = PitchParser.new
   NOTE_PARSER = NoteParser.new
+  METER_PARSER = MeterParser.new
   
   def duration dur_str
     DURATION_PARSER.parse(dur_str).to_r
@@ -44,6 +45,11 @@ module Parsing
     end
   end
   module_function :notes
+  
+  def meter meter_str
+    METER_PARSER.parse(meter_str).to_meter
+  end
+  module_function :meter
 end
 end
 end
@@ -80,4 +86,8 @@ class String
     Music::Transcription::Parsing::notes(self)
   end
   alias :to_ns :to_notes
+  
+  def to_meter
+    Music::Transcription::Parsing::meter(self)
+  end
 end