musicality 0.8.0 → 0.9.0

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

@@ -3,35 +3,35 @@ module Parsing
 
 grammar Articulation
   rule articulation
-    slur / legato / tenuto / portato / staccato / staccatissimo
+    tenuto / accent / marcato / portato / staccato / staccatissimo
   end
-  
-  rule slur
-    "(" {
+
+  rule tenuto
+    "-" {
       def to_articulation
-        Musicality::Articulations::SLUR
+        Musicality::Articulations::TENUTO
       end
     }
   end
 
-  rule legato
-    "[" {
+  rule accent
+    ">" {
       def to_articulation
-        Musicality::Articulations::LEGATO
+        Musicality::Articulations::ACCENT
       end
     }
   end
-  
-  rule tenuto
-    "_" {
+
+  rule marcato
+    "^" {
       def to_articulation
-        Musicality::Articulations::TENUTO
+        Musicality::Articulations::MARCATO
       end
     }
   end
   
   rule portato
-    "%" {
+    "_" {
       def to_articulation
         Musicality::Articulations::PORTATO
       end
@@ -47,7 +47,7 @@ grammar Articulation
   end
   
   rule staccatissimo
-    "'" {
+    "!" {
       def to_articulation
         Musicality::Articulations::STACCATISSIMO
       end

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

@@ -62,11 +62,11 @@ module Link
       return cached
     end
 
-    if (match_len = has_terminal?("=", false, index))
+    if (match_len = has_terminal?("~", false, index))
       r0 = instantiate_node(TieNode,input, index...(index + match_len))
       @index += match_len
     else
-      terminal_parse_failure("=")
+      terminal_parse_failure('"~"')
       r0 = nil
     end
 
@@ -93,11 +93,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
@@ -136,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

@@ -9,15 +9,15 @@ grammar Link
   end
   
   rule tie
-    "=" <TieNode>
+    "~" <TieNode>
   end
   
   rule glissando
-    "~" pitch <GlissandoNode>
+    ";" pitch <GlissandoNode>
   end
   
   rule portamento
-    "|" pitch <PortamentoNode>
+    ":" pitch <PortamentoNode>
   end
 end
 

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

@@ -0,0 +1,138 @@
+# Autogenerated from a Treetop grammar. Edits may be lost.
+
+
+module Musicality
+module Parsing
+
+module Mark
+  include Treetop::Runtime
+
+  def root
+    @root ||= :begin_slur
+  end
+
+  module BeginSlur0
+    def to_mark; return Musicality::Mark::Slur::Begin.new; end
+  end
+
+  def _nt_begin_slur
+    start_index = index
+    if node_cache[:begin_slur].has_key?(index)
+      cached = node_cache[:begin_slur][index]
+      if cached
+        node_cache[:begin_slur][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(BeginSlur0)
+      @index += match_len
+    else
+      terminal_parse_failure('"("')
+      r0 = nil
+    end
+
+    node_cache[:begin_slur][start_index] = r0
+
+    r0
+  end
+
+  module EndSlur0
+    def to_mark; return Musicality::Mark::Slur::End.new; end
+  end
+
+  def _nt_end_slur
+    start_index = index
+    if node_cache[:end_slur].has_key?(index)
+      cached = node_cache[:end_slur][index]
+      if cached
+        node_cache[:end_slur][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(EndSlur0)
+      @index += match_len
+    else
+      terminal_parse_failure('")"')
+      r0 = nil
+    end
+
+    node_cache[:end_slur][start_index] = r0
+
+    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
+  include Mark
+end
+
+
+end
+end

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

@@ -0,0 +1,31 @@
+module Musicality
+module Parsing
+
+grammar Mark
+  rule begin_slur
+    "(" {
+      def to_mark; return Musicality::Mark::Slur::Begin.new; end
+    }
+  end
+
+  rule end_slur
+    ")" {
+      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
+end

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

@@ -1,13 +1,11 @@
 module Musicality
 module Parsing
   class NoteNode < Treetop::Runtime::SyntaxNode
-    def primitives env
-      [ self.to_note ]
-    end
-    
     def to_note
+      dur = duration.to_r
+
       if more.empty?
-        return Musicality::Note.new(duration.to_r)
+        return Musicality::Note.new(dur)
       end
 
       pitches = []
@@ -27,15 +25,24 @@ module Parsing
           links[pitches[-1]] = x.pl.the_link.to_link
         end
       end
-      
-      artic = Musicality::Articulations::NORMAL
-      unless more.art.empty?
-        artic = more.art.to_articulation
+
+      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
+      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
       end
 
-      accent_flag = !more.acc.empty?
-      Musicality::Note.new(duration.to_r, pitches,
-        links: links, articulation: artic, accented: accent_flag)
+      Musicality::Note.new(dur, pitches, links: links, marks: marks,
+        articulation: more.art.empty? ? Articulations::NORMAL : more.art.to_articulation)
     end
   end
 end

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

@@ -19,13 +19,35 @@ module Note
 
   include Duration
 
+  include Mark
+
   module Note0
-    def pl
+    def first
+      elements[0]
+    end
+
+    def second
       elements[1]
     end
   end
 
   module Note1
+    def first
+      elements[0]
+    end
+
+    def second
+      elements[1]
+    end
+  end
+
+  module Note2
+    def pl
+      elements[1]
+    end
+  end
+
+  module Note3
     def first_pl
       elements[0]
     end
@@ -37,22 +59,46 @@ module Note
     def art
       elements[2]
     end
+  end
 
-    def acc
-      elements[3]
+  module Note4
+    def first
+      elements[0]
+    end
+
+    def second
+      elements[1]
     end
   end
 
-  module Note2
-    def duration
+  module Note5
+    def first
       elements[0]
     end
 
-    def more
+    def second
       elements[1]
     end
   end
 
+  module Note6
+    def begin_marks
+      elements[0]
+    end
+
+    def duration
+      elements[1]
+    end
+
+    def more
+      elements[2]
+    end
+
+    def end_marks
+      elements[3]
+    end
+  end
+
   def _nt_note
     start_index = index
     if node_cache[:note].has_key?(index)
@@ -65,79 +111,188 @@ module Note
     end
 
     i0, s0 = index, []
-    r1 = _nt_duration
+    i2 = index
+    i3, s3 = index, []
+    r4 = _nt_begin_triplet
+    s3 << r4
+    if r4
+      r6 = _nt_begin_slur
+      if r6
+        r5 = r6
+      else
+        r5 = instantiate_node(SyntaxNode,input, index...index)
+      end
+      s3 << r5
+    end
+    if s3.last
+      r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+      r3.extend(Note0)
+    else
+      @index = i3
+      r3 = nil
+    end
+    if r3
+      r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
+      r2 = r3
+    else
+      i7, s7 = index, []
+      r8 = _nt_begin_slur
+      s7 << r8
+      if r8
+        r10 = _nt_begin_triplet
+        if r10
+          r9 = r10
+        else
+          r9 = instantiate_node(SyntaxNode,input, index...index)
+        end
+        s7 << r9
+      end
+      if s7.last
+        r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
+        r7.extend(Note1)
+      else
+        @index = i7
+        r7 = nil
+      end
+      if r7
+        r7 = SyntaxNode.new(input, (index-1)...index) if r7 == true
+        r2 = r7
+      else
+        @index = i2
+        r2 = nil
+      end
+    end
+    if r2
+      r1 = r2
+    else
+      r1 = instantiate_node(SyntaxNode,input, index...index)
+    end
     s0 << r1
     if r1
-      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
+      r11 = _nt_duration
+      s0 << r11
+      if r11
+        i13, s13 = index, []
+        r14 = _nt_pitch_link
+        s13 << r14
+        if r14
+          s15, i15 = [], index
+          loop do
+            i16, s16 = index, []
+            if (match_len = has_terminal?(",", false, index))
+              r17 = true
+              @index += match_len
+            else
+              terminal_parse_failure('","')
+              r17 = nil
+            end
+            s16 << r17
+            if r17
+              r18 = _nt_pitch_link
+              s16 << r18
+            end
+            if s16.last
+              r16 = instantiate_node(SyntaxNode,input, i16...index, s16)
+              r16.extend(Note2)
+            else
+              @index = i16
+              r16 = nil
+            end
+            if r16
+              s15 << r16
+            else
+              break
+            end
           end
-          s6 << r7
-          if r7
-            r8 = _nt_pitch_link
-            s6 << r8
+          r15 = instantiate_node(SyntaxNode,input, i15...index, s15)
+          s13 << r15
+          if r15
+            r20 = _nt_articulation
+            if r20
+              r19 = r20
+            else
+              r19 = instantiate_node(SyntaxNode,input, index...index)
+            end
+            s13 << r19
           end
-          if s6.last
-            r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
-            r6.extend(Note0)
-          else
-            @index = i6
-            r6 = nil
+        end
+        if s13.last
+          r13 = instantiate_node(SyntaxNode,input, i13...index, s13)
+          r13.extend(Note3)
+        else
+          @index = i13
+          r13 = nil
+        end
+        if r13
+          r12 = r13
+        else
+          r12 = instantiate_node(SyntaxNode,input, index...index)
+        end
+        s0 << r12
+        if r12
+          i22 = index
+          i23, s23 = index, []
+          r24 = _nt_end_triplet
+          s23 << r24
+          if r24
+            r26 = _nt_end_slur
+            if r26
+              r25 = r26
+            else
+              r25 = instantiate_node(SyntaxNode,input, index...index)
+            end
+            s23 << r25
           end
-          if r6
-            s5 << r6
+          if s23.last
+            r23 = instantiate_node(SyntaxNode,input, i23...index, s23)
+            r23.extend(Note4)
           else
-            break
+            @index = i23
+            r23 = nil
           end
-        end
-        r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
-        s3 << r5
-        if r5
-          r10 = _nt_articulation
-          if r10
-            r9 = r10
+          if r23
+            r23 = SyntaxNode.new(input, (index-1)...index) if r23 == true
+            r22 = r23
           else
-            r9 = instantiate_node(SyntaxNode,input, index...index)
-          end
-          s3 << r9
-          if r9
-            r12 = _nt_accent
-            if r12
-              r11 = r12
+            i27, s27 = index, []
+            r28 = _nt_end_slur
+            s27 << r28
+            if r28
+              r30 = _nt_end_triplet
+              if r30
+                r29 = r30
+              else
+                r29 = instantiate_node(SyntaxNode,input, index...index)
+              end
+              s27 << r29
+            end
+            if s27.last
+              r27 = instantiate_node(SyntaxNode,input, i27...index, s27)
+              r27.extend(Note5)
+            else
+              @index = i27
+              r27 = nil
+            end
+            if r27
+              r27 = SyntaxNode.new(input, (index-1)...index) if r27 == true
+              r22 = r27
             else
-              r11 = instantiate_node(SyntaxNode,input, index...index)
+              @index = i22
+              r22 = nil
             end
-            s3 << r11
           end
+          if r22
+            r21 = r22
+          else
+            r21 = instantiate_node(SyntaxNode,input, index...index)
+          end
+          s0 << r21
         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)
-      r0.extend(Note2)
+      r0.extend(Note6)
     else
       @index = i0
       r0 = nil
@@ -194,30 +349,6 @@ module Note
     r0
   end
 
-  def _nt_accent
-    start_index = index
-    if node_cache[:accent].has_key?(index)
-      cached = node_cache[:accent][index]
-      if cached
-        node_cache[:accent][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))
-      @index += match_len
-    else
-      terminal_parse_failure("!")
-      r0 = nil
-    end
-
-    node_cache[:accent][start_index] = r0
-
-    r0
-  end
-
 end
 
 class NoteParser < Treetop::Runtime::CompiledParser