music-transcription 0.11.0 → 0.13.0

data/lib/music-transcription/packing/score_packing.rb

@@ -0,0 +1,59 @@
+module Music
+module Transcription
+
+class Score
+  def pack
+    packed_start_meter = start_meter.to_s
+    packed_mcs = Hash[ meter_changes.map do |offset,change|
+      a = change.pack
+      a[0] = a[0].to_s
+      [offset,a]
+    end ]
+
+    packed_tcs = Hash[ tempo_changes.map do |k,v|
+      [k,v.to_ary]
+    end ]
+
+    packed_parts = Hash[
+      @parts.map do |name,part|
+        [ name, part.pack ]
+      end
+    ]
+    packed_prog = program.pack
+    
+    { "start_meter" => packed_start_meter,
+      "meter_changes" => packed_mcs,
+      "start_tempo" => start_tempo,
+      "tempo_changes" => packed_tcs,
+      "program" => packed_prog,
+      "parts" => packed_parts,
+    }
+  end
+  
+  def self.unpack packing
+    unpacked_start_meter = Parsing::meter(packing["start_meter"])
+    unpacked_mcs = Hash[ packing["meter_changes"].map do |k,v|
+      v = v.clone
+      v[0] = Parsing::meter(v[0])
+      [k, Change.from_ary(v) ]
+    end ]
+    
+    unpacked_tcs = Hash[ packing["tempo_changes"].map do |k,v|
+      [k, Change.from_ary(v)]
+    end ]
+    
+    unpacked_parts = Hash[ packing["parts"].map do |name,packed|
+      [name, Part.unpack(packed)]
+    end ]
+    
+    unpacked_prog = Program.unpack packing["program"]
+    
+    new(unpacked_start_meter, packing["start_tempo"],
+      meter_changes: unpacked_mcs, tempo_changes: unpacked_tcs,
+      program: unpacked_prog, parts: unpacked_parts
+    )    
+  end
+end
+  
+end
+end

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

@@ -5,6 +5,7 @@ module Parsing
   PITCH_PARSER = PitchParser.new
   NOTE_PARSER = NoteParser.new
   METER_PARSER = MeterParser.new
+  SEGMENT_PARSER = SegmentParser.new
   
   def duration dur_str
     DURATION_PARSER.parse(dur_str).to_r
@@ -50,6 +51,11 @@ module Parsing
     METER_PARSER.parse(meter_str).to_meter
   end
   module_function :meter
+  
+  def segment seg_str
+    SEGMENT_PARSER.parse(seg_str).to_range
+  end
+  module_function :segment
 end
 end
 end
@@ -90,4 +96,8 @@ class String
   def to_meter
     Music::Transcription::Parsing::meter(self)
   end
+  
+  def to_segment
+    Music::Transcription::Parsing::segment(self)
+  end
 end

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

@@ -14,7 +14,39 @@ module Meter
 
   include PositiveInteger
 
-  module Meter0
+  def _nt_meter
+    start_index = index
+    if node_cache[:meter].has_key?(index)
+      cached = node_cache[:meter][index]
+      if cached
+        node_cache[:meter][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0 = index
+    r1 = _nt_meter1
+    if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
+      r0 = r1
+    else
+      r2 = _nt_meter2
+      if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
+        r0 = r2
+      else
+        @index = i0
+        r0 = nil
+      end
+    end
+
+    node_cache[:meter][start_index] = r0
+
+    r0
+  end
+
+  module Meter10
     def bpm
       elements[0]
     end
@@ -24,18 +56,18 @@ module Meter
     end
   end
 
-  module Meter1
+  module Meter11
     def to_meter
       Music::Transcription::Meter.new(bpm.to_i, Rational(1,bd.to_i))
     end
   end
 
-  def _nt_meter
+  def _nt_meter1
     start_index = index
-    if node_cache[:meter].has_key?(index)
-      cached = node_cache[:meter][index]
+    if node_cache[:meter1].has_key?(index)
+      cached = node_cache[:meter1][index]
       if cached
-        node_cache[:meter][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:meter1][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -60,14 +92,90 @@ module Meter
     end
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(Meter0)
-      r0.extend(Meter1)
+      r0.extend(Meter10)
+      r0.extend(Meter11)
     else
       @index = i0
       r0 = nil
     end
 
-    node_cache[:meter][start_index] = r0
+    node_cache[:meter1][start_index] = r0
+
+    r0
+  end
+
+  module Meter20
+    def bpm
+      elements[0]
+    end
+
+    def num
+      elements[2]
+    end
+
+    def den
+      elements[4]
+    end
+  end
+
+  module Meter21
+    def to_meter
+      Music::Transcription::Meter.new(bpm.to_i, Rational(num.to_i,den.to_i))
+    end
+  end
+
+  def _nt_meter2
+    start_index = index
+    if node_cache[:meter2].has_key?(index)
+      cached = node_cache[:meter2][index]
+      if cached
+        node_cache[:meter2][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0, s0 = index, []
+    r1 = _nt_positive_integer
+    s0 << r1
+    if r1
+      if (match_len = has_terminal?("*", false, index))
+        r2 = true
+        @index += match_len
+      else
+        terminal_parse_failure("*")
+        r2 = nil
+      end
+      s0 << r2
+      if r2
+        r3 = _nt_positive_integer
+        s0 << r3
+        if r3
+          if (match_len = has_terminal?("/", false, index))
+            r4 = true
+            @index += match_len
+          else
+            terminal_parse_failure("/")
+            r4 = nil
+          end
+          s0 << r4
+          if r4
+            r5 = _nt_positive_integer
+            s0 << r5
+          end
+        end
+      end
+    end
+    if s0.last
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(Meter20)
+      r0.extend(Meter21)
+    else
+      @index = i0
+      r0 = nil
+    end
+
+    node_cache[:meter2][start_index] = r0
 
     r0
   end

data/lib/music-transcription/parsing/meter_parsing.treetop

@@ -6,12 +6,24 @@ grammar Meter
   include PositiveInteger
   
   rule meter
+    meter1 / meter2
+  end
+  
+  rule meter1
     bpm:positive_integer "/" bd:positive_integer {
       def to_meter
         Music::Transcription::Meter.new(bpm.to_i, Rational(1,bd.to_i))
       end
     }
   end
+  
+  rule meter2
+    bpm:positive_integer "*" num:positive_integer "/" den:positive_integer {
+      def to_meter
+        Music::Transcription::Meter.new(bpm.to_i, Rational(num.to_i,den.to_i))
+      end
+    }
+  end
 end
 
 end

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

@@ -0,0 +1,42 @@
+module Music
+module Transcription
+module Parsing
+  class NoteNode < Treetop::Runtime::SyntaxNode
+    def primitives env
+      [ self.to_note ]
+    end
+    
+    def to_note
+      pitches = []
+      links = {}
+      
+      unless pitch_links.empty?
+        first = pitch_links.first
+        more = pitch_links.more
+        
+        pitches.push first.pitch.to_pitch
+        unless first.the_link.empty?
+          links[pitches[-1]] = first.the_link.to_link
+        end
+        
+        more.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
+      end
+      
+      artic = Music::Transcription::Articulations::NORMAL
+      unless art.empty?
+        artic = art.to_articulation
+      end
+      
+      accent_flag = acc.empty? ? false : true
+      Music::Transcription::Note.new(duration.to_r,
+        pitches, links: links, articulation: artic, accented: accent_flag)
+    end
+  end
+end
+end
+end

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

@@ -20,151 +20,23 @@ module Note
 
   include Duration
 
-  def _nt_note
-    start_index = index
-    if node_cache[:note].has_key?(index)
-      cached = node_cache[:note][index]
-      if cached
-        node_cache[:note][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-        @index = cached.interval.end
-      end
-      return cached
-    end
-
-    i0 = index
-    r1 = _nt_polyphonic_note
-    if r1
-      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
-      r0 = r1
-    else
-      r2 = _nt_monophonic_note
-      if r2
-        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
-        r0 = r2
-      else
-        r3 = _nt_rest_note
-        if r3
-          r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
-          r0 = r3
-        else
-          @index = i0
-          r0 = nil
-        end
-      end
-    end
-
-    node_cache[:note][start_index] = r0
-
-    r0
-  end
-
-  module RestNote0
-    def duration
-      elements[0]
-    end
-  end
-
-  def _nt_rest_note
-    start_index = index
-    if node_cache[:rest_note].has_key?(index)
-      cached = node_cache[:rest_note][index]
-      if cached
-        node_cache[:rest_note][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-        @index = cached.interval.end
-      end
-      return cached
-    end
-
-    i0, s0 = index, []
-    r1 = _nt_duration
-    s0 << r1
-    if s0.last
-      r0 = instantiate_node(RestNoteNode,input, i0...index, s0)
-      r0.extend(RestNote0)
-    else
-      @index = i0
-      r0 = nil
-    end
-
-    node_cache[:rest_note][start_index] = r0
-
-    r0
-  end
-
-  module MonophonicNote0
-    def duration
-      elements[0]
-    end
-
-    def art
-      elements[1]
-    end
-
+  module Note0
     def pl
-      elements[2]
-    end
-
-    def acc
-      elements[3]
+      elements[1]
     end
   end
 
-  def _nt_monophonic_note
-    start_index = index
-    if node_cache[:monophonic_note].has_key?(index)
-      cached = node_cache[:monophonic_note][index]
-      if cached
-        node_cache[:monophonic_note][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-        @index = cached.interval.end
-      end
-      return cached
-    end
-
-    i0, s0 = index, []
-    r1 = _nt_duration
-    s0 << r1
-    if r1
-      r3 = _nt_articulation
-      if r3
-        r2 = r3
-      else
-        r2 = instantiate_node(SyntaxNode,input, index...index)
-      end
-      s0 << r2
-      if r2
-        r4 = _nt_pitch_link
-        s0 << r4
-        if r4
-          r6 = _nt_accent
-          if r6
-            r5 = r6
-          else
-            r5 = instantiate_node(SyntaxNode,input, index...index)
-          end
-          s0 << r5
-        end
-      end
-    end
-    if s0.last
-      r0 = instantiate_node(MonophonicNoteNode,input, i0...index, s0)
-      r0.extend(MonophonicNote0)
-    else
-      @index = i0
-      r0 = nil
+  module Note1
+    def first
+      elements[0]
     end
 
-    node_cache[:monophonic_note][start_index] = r0
-
-    r0
-  end
-
-  module PolyphonicNote0
-    def pl
+    def more
       elements[1]
     end
   end
 
-  module PolyphonicNote1
+  module Note2
     def duration
       elements[0]
     end
@@ -173,25 +45,21 @@ module Note
       elements[1]
     end
 
-    def pl
+    def pitch_links
       elements[2]
     end
 
-    def more_pitches
-      elements[3]
-    end
-
     def acc
-      elements[4]
+      elements[3]
     end
   end
 
-  def _nt_polyphonic_note
+  def _nt_note
     start_index = index
-    if node_cache[:polyphonic_note].has_key?(index)
-      cached = node_cache[:polyphonic_note][index]
+    if node_cache[:note].has_key?(index)
+      cached = node_cache[:note][index]
       if cached
-        node_cache[:polyphonic_note][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:note][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -209,65 +77,74 @@ module Note
       end
       s0 << r2
       if r2
-        r4 = _nt_pitch_link
-        s0 << r4
-        if r4
-          s5, i5 = [], index
+        i5, s5 = index, []
+        r6 = _nt_pitch_link
+        s5 << r6
+        if r6
+          s7, i7 = [], index
           loop do
-            i6, s6 = index, []
+            i8, s8 = index, []
             if (match_len = has_terminal?(",", false, index))
-              r7 = true
+              r9 = true
               @index += match_len
             else
               terminal_parse_failure(",")
-              r7 = nil
+              r9 = nil
             end
-            s6 << r7
-            if r7
-              r8 = _nt_pitch_link
-              s6 << r8
+            s8 << r9
+            if r9
+              r10 = _nt_pitch_link
+              s8 << r10
             end
-            if s6.last
-              r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
-              r6.extend(PolyphonicNote0)
+            if s8.last
+              r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
+              r8.extend(Note0)
             else
-              @index = i6
-              r6 = nil
+              @index = i8
+              r8 = nil
             end
-            if r6
-              s5 << r6
+            if r8
+              s7 << r8
             else
               break
             end
           end
-          if s5.empty?
-            @index = i5
-            r5 = nil
+          r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
+          s5 << r7
+        end
+        if s5.last
+          r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
+          r5.extend(Note1)
+        else
+          @index = i5
+          r5 = nil
+        end
+        if r5
+          r4 = r5
+        else
+          r4 = instantiate_node(SyntaxNode,input, index...index)
+        end
+        s0 << r4
+        if r4
+          r12 = _nt_accent
+          if r12
+            r11 = r12
           else
-            r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
-          end
-          s0 << r5
-          if r5
-            r10 = _nt_accent
-            if r10
-              r9 = r10
-            else
-              r9 = instantiate_node(SyntaxNode,input, index...index)
-            end
-            s0 << r9
+            r11 = instantiate_node(SyntaxNode,input, index...index)
           end
+          s0 << r11
         end
       end
     end
     if s0.last
-      r0 = instantiate_node(PolyphonicNoteNode,input, i0...index, s0)
-      r0.extend(PolyphonicNote1)
+      r0 = instantiate_node(NoteNode,input, i0...index, s0)
+      r0.extend(Note2)
     else
       @index = i0
       r0 = nil
     end
 
-    node_cache[:polyphonic_note][start_index] = r0
+    node_cache[:note][start_index] = r0
 
     r0
   end