musicality 0.3.0 → 0.5.0

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

@@ -0,0 +1,22 @@
+module Musicality
+
+ARTICULATION_SYMBOLS = {
+  Articulations::SLUR => "(",
+  Articulations::LEGATO => "[",
+  Articulations::TENUTO => "_",
+  Articulations::PORTATO => "%",
+  Articulations::STACCATO => ".",
+  Articulations::STACCATISSIMO => "'"
+}
+
+LINK_SYMBOLS = {
+  Links::TIE => "=",
+  Links::GLISSANDO => "~",
+  Links::PORTAMENTO => "|",
+  Links::SLUR => ARTICULATION_SYMBOLS[Articulations::SLUR],
+  Links::LEGATO => ARTICULATION_SYMBOLS[Articulations::LEGATO],
+}
+
+ACCENT_SYMBOL = "!"
+
+end

data/lib/musicality/notation/packing/score_packing.rb

@@ -84,7 +84,7 @@ class Score
         [ name, part.pack ]
       end
     ]
-    packed_prog = program.pack
+    packed_prog = @program.map {|seg| seg.to_s }
     
     { "type" => self.class.to_s.split("::")[-1],
       "program" => packed_prog,
@@ -96,8 +96,7 @@ class Score
     unpacked_parts = Hash[ packing["parts"].map do |name,packed|
       [name, Part.unpack(packed)]
     end ]
-    
-    unpacked_prog = Program.unpack packing["program"]
+    unpacked_prog = packing["program"].map {|str| Segment.parse(str) }
     
     new(program: unpacked_prog,
       parts: unpacked_parts

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

@@ -84,12 +84,12 @@ module Articulation
       return cached
     end
 
-    if (match_len = has_terminal?("=", false, index))
+    if (match_len = has_terminal?("(", false, index))
       r0 = instantiate_node(SyntaxNode,input, index...(index + match_len))
       r0.extend(Slur0)
       @index += match_len
     else
-      terminal_parse_failure("=")
+      terminal_parse_failure("(")
       r0 = nil
     end
 
@@ -115,12 +115,12 @@ module Articulation
       return cached
     end
 
-    if (match_len = has_terminal?("|", false, index))
+    if (match_len = has_terminal?("[", false, index))
       r0 = instantiate_node(SyntaxNode,input, index...(index + match_len))
       r0.extend(Legato0)
       @index += match_len
     else
-      terminal_parse_failure("|")
+      terminal_parse_failure("[")
       r0 = nil
     end
 

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

@@ -7,7 +7,7 @@ grammar Articulation
   end
   
   rule slur
-    "=" {
+    "(" {
       def to_articulation
         Musicality::Articulations::SLUR
       end
@@ -15,7 +15,7 @@ grammar Articulation
   end
 
   rule legato
-    "|" {
+    "[" {
       def to_articulation
         Musicality::Articulations::LEGATO
       end

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

@@ -1,28 +1,16 @@
 module Musicality
 module Parsing
   class LinkNode < Treetop::Runtime::SyntaxNode; end
-    
-  class SlurNode < LinkNode
-    def to_link
-      Musicality::Link::Slur.new(target.to_pitch)
-    end
-  end
-
-  class LegatoNode < LinkNode
-    def to_link
-      Musicality::Link::Legato.new(target.to_pitch)
-    end
-  end
 
   class GlissandoNode < LinkNode
     def to_link
-      Musicality::Link::Glissando.new(target.to_pitch)
+      Musicality::Link::Glissando.new(pitch.to_pitch)
     end
   end
   
   class PortamentoNode < LinkNode
     def to_link
-      Musicality::Link::Portamento.new(target.to_pitch)
+      Musicality::Link::Portamento.new(pitch.to_pitch)
     end
   end
   

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

@@ -25,35 +25,23 @@ module Link
     end
 
     i0 = index
-    r1 = _nt_slur_link
+    r1 = _nt_tie
     if r1
       r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
     else
-      r2 = _nt_tie
+      r2 = _nt_glissando
       if r2
         r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2
       else
-        r3 = _nt_legato_link
+        r3 = _nt_portamento
         if r3
           r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
           r0 = r3
         else
-          r4 = _nt_glissando
-          if r4
-            r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
-            r0 = r4
-          else
-            r5 = _nt_portamento
-            if r5
-              r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
-              r0 = r5
-            else
-              @index = i0
-              r0 = nil
-            end
-          end
+          @index = i0
+          r0 = nil
         end
       end
     end
@@ -63,49 +51,6 @@ module Link
     r0
   end
 
-  module SlurLink0
-    def target
-      elements[1]
-    end
-  end
-
-  def _nt_slur_link
-    start_index = index
-    if node_cache[:slur_link].has_key?(index)
-      cached = node_cache[:slur_link][index]
-      if cached
-        node_cache[:slur_link][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-        @index = cached.interval.end
-      end
-      return cached
-    end
-
-    i0, s0 = index, []
-    if (match_len = has_terminal?("=", false, index))
-      r1 = true
-      @index += match_len
-    else
-      terminal_parse_failure("=")
-      r1 = nil
-    end
-    s0 << r1
-    if r1
-      r2 = _nt_pitch
-      s0 << r2
-    end
-    if s0.last
-      r0 = instantiate_node(SlurNode,input, i0...index, s0)
-      r0.extend(SlurLink0)
-    else
-      @index = i0
-      r0 = nil
-    end
-
-    node_cache[:slur_link][start_index] = r0
-
-    r0
-  end
-
   def _nt_tie
     start_index = index
     if node_cache[:tie].has_key?(index)
@@ -130,51 +75,8 @@ module Link
     r0
   end
 
-  module LegatoLink0
-    def target
-      elements[1]
-    end
-  end
-
-  def _nt_legato_link
-    start_index = index
-    if node_cache[:legato_link].has_key?(index)
-      cached = node_cache[:legato_link][index]
-      if cached
-        node_cache[:legato_link][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-        @index = cached.interval.end
-      end
-      return cached
-    end
-
-    i0, s0 = index, []
-    if (match_len = has_terminal?("|", false, index))
-      r1 = true
-      @index += match_len
-    else
-      terminal_parse_failure("|")
-      r1 = nil
-    end
-    s0 << r1
-    if r1
-      r2 = _nt_pitch
-      s0 << r2
-    end
-    if s0.last
-      r0 = instantiate_node(LegatoNode,input, i0...index, s0)
-      r0.extend(LegatoLink0)
-    else
-      @index = i0
-      r0 = nil
-    end
-
-    node_cache[:legato_link][start_index] = r0
-
-    r0
-  end
-
   module Glissando0
-    def target
+    def pitch
       elements[1]
     end
   end
@@ -217,7 +119,7 @@ module Link
   end
 
   module Portamento0
-    def target
+    def pitch
       elements[1]
     end
   end
@@ -234,11 +136,11 @@ module Link
     end
 
     i0, s0 = index, []
-    if (match_len = has_terminal?("/", false, index))
+    if (match_len = has_terminal?("|", false, index))
       r1 = true
       @index += match_len
     else
-      terminal_parse_failure("/")
+      terminal_parse_failure("|")
       r1 = nil
     end
     s0 << r1

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

@@ -3,29 +3,21 @@ module Parsing
 
 grammar Link
   include Pitch
-  
+
   rule link
-    slur_link / tie / legato_link / glissando / portamento
+    tie / glissando / portamento
   end
   
-  rule slur_link
-    "=" target:pitch <SlurNode>
-  end
-
   rule tie
     "=" <TieNode>
   end
   
-  rule legato_link
-    "|" target:pitch <LegatoNode>
-  end
-  
   rule glissando
-    "~" target:pitch <GlissandoNode>
+    "~" pitch <GlissandoNode>
   end
   
   rule portamento
-    "/" target:pitch <PortamentoNode>
+    "|" pitch <PortamentoNode>
   end
 end
 

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

@@ -6,34 +6,36 @@ module Parsing
     end
     
     def to_note
+      if more.empty?
+        return Musicality::Note.new(duration.to_r)
+      end
+
       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
+
+      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
+
+      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
       
       artic = Musicality::Articulations::NORMAL
-      unless art.empty?
-        artic = art.to_articulation
+      unless more.art.empty?
+        artic = more.art.to_articulation
       end
-      
-      accent_flag = acc.empty? ? false : true
-      Musicality::Note.new(duration.to_r,
-        pitches, links: links, articulation: artic, accented: accent_flag)
+
+      accent_flag = !more.acc.empty?
+      Musicality::Note.new(duration.to_r, pitches,
+        links: links, articulation: artic, accented: accent_flag)
     end
   end
 end

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

@@ -26,13 +26,21 @@ module Note
   end
 
   module Note1
-    def first
+    def first_pl
       elements[0]
     end
 
-    def more
+    def more_pl
       elements[1]
     end
+
+    def art
+      elements[2]
+    end
+
+    def acc
+      elements[3]
+    end
   end
 
   module Note2
@@ -40,17 +48,9 @@ module Note
       elements[0]
     end
 
-    def art
+    def more
       elements[1]
     end
-
-    def pitch_links
-      elements[2]
-    end
-
-    def acc
-      elements[3]
-    end
   end
 
   def _nt_note
@@ -68,72 +68,72 @@ module Note
     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
-        i5, s5 = index, []
-        r6 = _nt_pitch_link
-        s5 << r6
-        if r6
-          s7, i7 = [], index
-          loop do
-            i8, s8 = index, []
-            if (match_len = has_terminal?(",", false, index))
-              r9 = true
-              @index += match_len
-            else
-              terminal_parse_failure(",")
-              r9 = nil
-            end
-            s8 << r9
-            if r9
-              r10 = _nt_pitch_link
-              s8 << r10
-            end
-            if s8.last
-              r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
-              r8.extend(Note0)
-            else
-              @index = i8
-              r8 = nil
-            end
-            if r8
-              s7 << r8
-            else
-              break
-            end
+      i3, s3 = index, []
+      r4 = _nt_pitch_link
+      s3 << r4
+      if r4
+        s5, i5 = [], index
+        loop do
+          i6, s6 = index, []
+          if (match_len = has_terminal?(",", false, index))
+            r7 = true
+            @index += match_len
+          else
+            terminal_parse_failure(",")
+            r7 = nil
+          end
+          s6 << r7
+          if r7
+            r8 = _nt_pitch_link
+            s6 << r8
+          end
+          if s6.last
+            r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
+            r6.extend(Note0)
+          else
+            @index = i6
+            r6 = nil
+          end
+          if r6
+            s5 << r6
+          else
+            break
           end
-          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
+        r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
+        s3 << r5
         if r5
-          r4 = r5
-        else
-          r4 = instantiate_node(SyntaxNode,input, index...index)
-        end
-        s0 << r4
-        if r4
-          r12 = _nt_accent
-          if r12
-            r11 = r12
+          r10 = _nt_articulation
+          if r10
+            r9 = r10
           else
-            r11 = instantiate_node(SyntaxNode,input, index...index)
+            r9 = instantiate_node(SyntaxNode,input, index...index)
+          end
+          s3 << r9
+          if r9
+            r12 = _nt_accent
+            if r12
+              r11 = r12
+            else
+              r11 = instantiate_node(SyntaxNode,input, index...index)
+            end
+            s3 << r11
           end
-          s0 << r11
         end
       end
+      if s3.last
+        r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+        r3.extend(Note1)
+      else
+        @index = i3
+        r3 = nil
+      end
+      if r3
+        r2 = r3
+      else
+        r2 = instantiate_node(SyntaxNode,input, index...index)
+      end
+      s0 << r2
     end
     if s0.last
       r0 = instantiate_node(NoteNode,input, i0...index, s0)