musicality 0.9.0 → 0.10.0

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

@@ -19,35 +19,13 @@ module Note
 
   include Duration
 
-  include Mark
-
   module Note0
-    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
+  module Note1
     def first_pl
       elements[0]
     end
@@ -61,28 +39,8 @@ module Note
     end
   end
 
-  module Note4
-    def first
-      elements[0]
-    end
-
-    def second
-      elements[1]
-    end
-  end
-
-  module Note5
-    def first
-      elements[0]
-    end
-
-    def second
-      elements[1]
-    end
-  end
-
-  module Note6
-    def begin_marks
+  module Note2
+    def begin_slur
       elements[0]
     end
 
@@ -94,7 +52,7 @@ module Note
       elements[2]
     end
 
-    def end_marks
+    def end_slur
       elements[3]
     end
   end
@@ -111,56 +69,12 @@ module Note
     end
 
     i0, s0 = index, []
-    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
+    if (match_len = has_terminal?("(", false, index))
+      r2 = true
+      @index += match_len
     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
+      terminal_parse_failure('"("')
+      r2 = nil
     end
     if r2
       r1 = r2
@@ -169,130 +83,86 @@ module Note
     end
     s0 << r1
     if r1
-      r11 = _nt_duration
-      s0 << r11
-      if r11
-        i13, s13 = index, []
-        r14 = _nt_pitch_link
-        s13 << r14
-        if r14
-          s15, i15 = [], index
+      r3 = _nt_duration
+      s0 << r3
+      if r3
+        i5, s5 = index, []
+        r6 = _nt_pitch_link
+        s5 << r6
+        if r6
+          s7, i7 = [], index
           loop do
-            i16, s16 = index, []
+            i8, s8 = index, []
             if (match_len = has_terminal?(",", false, index))
-              r17 = true
+              r9 = true
               @index += match_len
             else
               terminal_parse_failure('","')
-              r17 = nil
+              r9 = nil
             end
-            s16 << r17
-            if r17
-              r18 = _nt_pitch_link
-              s16 << r18
+            s8 << r9
+            if r9
+              r10 = _nt_pitch_link
+              s8 << r10
             end
-            if s16.last
-              r16 = instantiate_node(SyntaxNode,input, i16...index, s16)
-              r16.extend(Note2)
+            if s8.last
+              r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
+              r8.extend(Note0)
             else
-              @index = i16
-              r16 = nil
+              @index = i8
+              r8 = nil
             end
-            if r16
-              s15 << r16
+            if r8
+              s7 << r8
             else
               break
             end
           end
-          r15 = instantiate_node(SyntaxNode,input, i15...index, s15)
-          s13 << r15
-          if r15
-            r20 = _nt_articulation
-            if r20
-              r19 = r20
+          r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
+          s5 << r7
+          if r7
+            r12 = _nt_articulation
+            if r12
+              r11 = r12
             else
-              r19 = instantiate_node(SyntaxNode,input, index...index)
+              r11 = instantiate_node(SyntaxNode,input, index...index)
             end
-            s13 << r19
+            s5 << r11
           end
         end
-        if s13.last
-          r13 = instantiate_node(SyntaxNode,input, i13...index, s13)
-          r13.extend(Note3)
+        if s5.last
+          r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
+          r5.extend(Note1)
         else
-          @index = i13
-          r13 = nil
+          @index = i5
+          r5 = nil
         end
-        if r13
-          r12 = r13
+        if r5
+          r4 = r5
         else
-          r12 = instantiate_node(SyntaxNode,input, index...index)
+          r4 = 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 s23.last
-            r23 = instantiate_node(SyntaxNode,input, i23...index, s23)
-            r23.extend(Note4)
+        s0 << r4
+        if r4
+          if (match_len = has_terminal?(")", false, index))
+            r14 = true
+            @index += match_len
           else
-            @index = i23
-            r23 = nil
-          end
-          if r23
-            r23 = SyntaxNode.new(input, (index-1)...index) if r23 == true
-            r22 = r23
-          else
-            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
-              @index = i22
-              r22 = nil
-            end
+            terminal_parse_failure('")"')
+            r14 = nil
           end
-          if r22
-            r21 = r22
+          if r14
+            r13 = r14
           else
-            r21 = instantiate_node(SyntaxNode,input, index...index)
+            r13 = instantiate_node(SyntaxNode,input, index...index)
           end
-          s0 << r21
+          s0 << r13
         end
       end
     end
     if s0.last
       r0 = instantiate_node(NoteNode,input, i0...index, s0)
-      r0.extend(Note6)
+      r0.extend(Note2)
     else
       @index = i0
       r0 = nil

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

@@ -6,23 +6,16 @@ grammar Note
   include Articulation
   include Link
   include Duration
-  include Mark
 
   rule note
-    begin_marks:(
-      (first:begin_triplet second:begin_slur?) / 
-      (first:begin_slur second:begin_triplet?)
-    )?
+    begin_slur:"("?
     duration
     more:(
       first_pl:pitch_link
       more_pl:("," pl:pitch_link)*
       art:articulation?
     )?
-    end_marks:(
-      (first:end_triplet second:end_slur?) / 
-      (first:end_slur second:end_triplet?)
-    )?
+    end_slur:")"?
     <NoteNode>
   end
 

data/lib/musicality/performance/conversion/note_sequence_extractor.rb

@@ -3,7 +3,7 @@ module Musicality
 class NoteSequenceExtractor
   attr_reader :notes
   def initialize notes
-    prepare_notes(notes)
+    @notes = notes.map {|n| n.clone }
     mark_slurring
     remove_bad_links
     calculate_offsets
@@ -134,25 +134,6 @@ class NoteSequenceExtractor
     end
   end
 
-  def prepare_notes notes
-    in_triplet = false
-    @notes = Array.new(notes.size) do |i|
-      note = notes[i]
-
-      if note.begins_triplet?
-        in_triplet = true
-      end
-      
-      new_note = in_triplet ? note.resize(note.duration * Rational(2,3)) : note.clone
-
-      if note.ends_triplet?
-        in_triplet = false
-      end
-
-      new_note
-    end
-  end
-
   def mark_slurring
     @slurring_flags = []
     under_slur = false

data/lib/musicality/performance/model/note_sequence.rb

@@ -49,7 +49,7 @@ class NoteSequence
   end
 
   def full_duration
-    offsets.last + elements.last.duration
+    @elements.map {|el| el.duration }.inject(0,:+)
   end
 
   def first_pitch

data/lib/musicality/printing/lilypond/note_engraving.rb

@@ -3,7 +3,7 @@ module Musicality
 class Note
   SMALLEST_PIECE = Rational(1,256)
 
-  def to_lilypond sharpit = false
+  def to_lilypond sharpit = false, begins_triplet: false, ends_triplet: false
     subdurs = [1]*@duration.to_i + fractional_subdurs(SMALLEST_PIECE)
 
     piece_strs = []
@@ -63,11 +63,11 @@ class Note
       end
     end
 
-    if begins_triplet?
+    if begins_triplet
       piece_strs[0].prepend("\\tuplet 3/2 {")
     end
 
-    if ends_triplet?
+    if ends_triplet
       piece_strs[-1].concat("}")
     end
 

data/lib/musicality/printing/lilypond/part_engraver.rb

@@ -14,6 +14,10 @@ class PartEngraver
     @part = (@transpose_interval == 0) ? part : part.transpose(@transpose_interval)
     @title = title
     @indent = INDENT
+
+    @triplet_flags = @part.notes.map do |note|
+      note.duration.to_r.denominator % 3 == 0
+    end
   end
 
   def increase_indent
@@ -50,7 +54,17 @@ class PartEngraver
   end
 
   def make_body sharpit
-    pieces = @part.notes.map {|n| n.to_lilypond(sharpit)}
+    i = 0
+    pieces = @part.notes.map do |n|
+      if @triplet_flags[i]
+        n.resize(n.duration * Rational(3,2)).to_lilypond(sharpit,
+          begins_triplet: i == 0 || !@triplet_flags[i-1],
+          ends_triplet: i == (@triplet_flags.size-1) || !@triplet_flags[i+1])
+      else
+        n.to_lilypond(sharpit)
+      end
+      i += 1
+    end
 
     output = ""
     while pieces.any?
@@ -82,24 +96,14 @@ class PartEngraver
     ranges = CLEF_RANGES.select {|clef,range| allowed_clefs.include?(clef) }
     range_scores = Hash.new(0)
 
-    in_triplet = false
     notes.each do |note|
-      if note.begins_triplet?
-        in_triplet = true
-      end
-
-      dur = note.duration * (in_triplet ? Rational(2,3) : 1)
       note.pitches.each do |p|
         ranges.each do |name,range|
           if p >= range.min && p <= range.max
-            range_scores[name] += dur
+            range_scores[name] += note.duration
           end
         end
       end
-
-      if note.ends_triplet?
-        in_triplet = false
-      end
     end
     range_score = range_scores.max_by {|range,score| score}
     range_score.nil? ? allowed_clefs.first : range_score[0]