music-transcription 0.15.0 → 0.16.0

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

@@ -116,12 +116,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/music-transcription/parsing/articulation_parsing.treetop

@@ -16,7 +16,7 @@ grammar Articulation
   end
 
   rule legato
-    "-" {
+    "|" {
       def to_articulation
         Music::Transcription::Articulations::LEGATO
       end

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

@@ -149,11 +149,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/music-transcription/parsing/link_parsing.treetop

@@ -18,7 +18,7 @@ grammar Link
   end
   
   rule legato_link
-    "-" target:pitch <LegatoNode>
+    "|" target:pitch <LegatoNode>
   end
   
   rule glissando

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

@@ -11,8 +11,13 @@ module Parsing
         when "b" then -1
         end
       end
-      oct = octn.text_value.to_i
-      Music::Transcription::Pitch.new(semitone: sem, octave: oct)
+      oct = octave.to_i
+      ncents = 0
+      unless cents.empty?
+        ncents = cents.to_i
+      end
+      
+      Music::Transcription::Pitch.new(semitone: sem, octave: oct, cent: ncents)
     end
   end
 end

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

@@ -12,6 +12,8 @@ module Pitch
     @root ||= :pitch
   end
 
+  include NonnegativeInteger
+
   module Pitch0
     def pitch_letter
       elements[0]
@@ -21,9 +23,13 @@ module Pitch
       elements[1]
     end
 
-    def octn
+    def octave
       elements[2]
     end
+
+    def cents
+      elements[3]
+    end
   end
 
   def _nt_pitch
@@ -55,14 +61,17 @@ module Pitch
       end
       s0 << r2
       if r2
-        if has_terminal?(@regexps[gr = '\A[0-9]'] ||= Regexp.new(gr), :regexp, index)
-          r4 = true
-          @index += 1
-        else
-          terminal_parse_failure('[0-9]')
-          r4 = nil
-        end
+        r4 = _nt_octave
         s0 << r4
+        if r4
+          r6 = _nt_cent
+          if r6
+            r5 = r6
+          else
+            r5 = instantiate_node(SyntaxNode,input, index...index)
+          end
+          s0 << r5
+        end
       end
     end
     if s0.last
@@ -78,6 +87,92 @@ module Pitch
     r0
   end
 
+  module Octave0
+    def n
+      elements[0]
+    end
+  end
+
+  module Octave1
+    def to_i; n.to_i; end
+  end
+
+  def _nt_octave
+    start_index = index
+    if node_cache[:octave].has_key?(index)
+      cached = node_cache[:octave][index]
+      if cached
+        node_cache[:octave][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0, s0 = index, []
+    r1 = _nt_nonnegative_integer
+    s0 << r1
+    if s0.last
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(Octave0)
+      r0.extend(Octave1)
+    else
+      @index = i0
+      r0 = nil
+    end
+
+    node_cache[:octave][start_index] = r0
+
+    r0
+  end
+
+  module Cent0
+    def n
+      elements[1]
+    end
+  end
+
+  module Cent1
+    def to_i; text_value.to_i; end
+  end
+
+  def _nt_cent
+    start_index = index
+    if node_cache[:cent].has_key?(index)
+      cached = node_cache[:cent][index]
+      if cached
+        node_cache[:cent][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0, s0 = index, []
+    if has_terminal?(@regexps[gr = '\A[+-]'] ||= Regexp.new(gr), :regexp, index)
+      r1 = true
+      @index += 1
+    else
+      terminal_parse_failure('[+-]')
+      r1 = nil
+    end
+    s0 << r1
+    if r1
+      r2 = _nt_nonnegative_integer
+      s0 << r2
+    end
+    if s0.last
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(Cent0)
+      r0.extend(Cent1)
+    else
+      @index = i0
+      r0 = nil
+    end
+
+    node_cache[:cent][start_index] = r0
+
+    r0
+  end
+
   def _nt_pitch_letter
     start_index = index
     if node_cache[:pitch_letter].has_key?(index)

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

@@ -3,8 +3,17 @@ module Transcription
 module Parsing
 
 grammar Pitch
+  include NonnegativeInteger
   rule pitch
-    pitch_letter mod:[#b]? octn:[0-9] <PitchNode>
+    pitch_letter mod:[#b]? octave cents:cent? <PitchNode>
+  end
+  
+  rule octave
+    n:nonnegative_integer { def to_i; n.to_i; end }
+  end
+  
+  rule cent
+    [+-] n:nonnegative_integer { def to_i; text_value.to_i; end }
   end
   
   rule pitch_letter

data/lib/music-transcription/version.rb

@@ -2,6 +2,6 @@
 module Music
 module Transcription
   # music-transcription version
-  VERSION = "0.15.0"
+  VERSION = "0.16.0"
 end
 end

data/spec/model/note_spec.rb

@@ -138,7 +138,8 @@ describe Note do
       
       notes.each do |note|
         str = note.to_s
-        note2 = @note_parser.parse(str).to_note
+        res = @note_parser.parse(str)
+        note2 = res.to_note
         note2.should eq(note)
       end
     end

data/spec/model/pitch_spec.rb

@@ -5,15 +5,19 @@ describe Pitch do
   before :each do
     @cases = 
     [
-      { octave: 1, semitone: 0, :ratio => 2.0, :total_semitone => 12 },
-      { octave: 2, semitone: 0, :ratio => 4.0, :total_semitone => 24 },
-      { octave: 1, semitone: 6, :ratio => 2.828, :total_semitone => 18 },
-      { octave: 2, semitone: 6, :ratio => 5.657, :total_semitone => 30 },
-      { octave: 3, semitone: 7, :ratio => 11.986, :total_semitone => 43 },
-      { octave: -1, semitone: 0, :ratio => 0.5, :total_semitone => -12 },
-      { octave: -2, semitone: 0, :ratio => 0.25, :total_semitone => -24 },
-      { octave: -2, semitone: 7, :ratio => 0.375, :total_semitone => -17 },
-      { octave: -1, semitone: 9, :ratio => 0.841, :total_semitone => -3 },
+      { :octave => 1, :semitone => 0, :cent => 0, :ratio => 2.0, :total_cents => 1200 },
+      { :octave => 2, :semitone => 0, :cent => 0, :ratio => 4.0, :total_cents => 2400 },
+      { :octave => 1, :semitone => 6, :cent => 0, :ratio => 2.828, :total_cents => 1800 },
+      { :octave => 2, :semitone => 6, :cent => 0, :ratio => 5.657, :total_cents => 3000 },
+      { :octave => 3, :semitone => 7, :cent => 0, :ratio => 11.986, :total_cents => 4300 },
+      { :octave => -1, :semitone => 0, :cent => 0, :ratio => 0.5, :total_cents => -1200 },
+      { :octave => -2, :semitone => 0, :cent => 0, :ratio => 0.25, :total_cents => -2400 },
+      { :octave => -2, :semitone => 7, :cent => 0, :ratio => 0.37458, :total_cents => -1700 },
+      { :octave => -1, :semitone => 9, :cent => 0, :ratio => 0.841, :total_cents => -300 },
+      { :octave => 5, :semitone => 0, :cent => 20, :ratio => 32.372, :total_cents => 6020 },
+      { :octave => 3, :semitone => 3, :cent => 95, :ratio => 10.0503, :total_cents => 3995 },
+      { :octave => -3, :semitone => 2, :cent => -20, :ratio => 0.1387, :total_cents => -3420 },
+      { :octave => -5, :semitone => -2, :cent => -77, :ratio => 0.02663, :total_cents => -6277 }
     ]
   end
   
@@ -22,30 +26,38 @@ describe Pitch do
   end
   
   it "should take keyword args" do
-    obj = Pitch.new octave: 4, semitone: 3
+    obj = Pitch.new octave: 4, semitone: 3, cent: 5
     obj.octave.should eq(4)
     obj.semitone.should eq(3)
+    obj.cent.should eq(5)
   end
   
-  it "should use default octave and semitone if none is given" do
+  it "should use default octave, semitone, and cent if none is given" do
     p = Pitch.new
     p.ratio.should be_within(0.01).of(1.0)
-    p.total_semitone.should eq(0)
+    p.total_cents.should eq(0)
   end
   
   it "should use the octave and semitone given during construction" do
     @cases.each do |case_data|
-      p = Pitch.new octave: case_data[:octave], semitone: case_data[:semitone]
+      p = Pitch.new octave: case_data[:octave], semitone: case_data[:semitone], cent: case_data[:cent]
       p.ratio.should be_within(0.01).of case_data[:ratio]
-      p.total_semitone.should be case_data[:total_semitone]
+      p.total_cents.should be case_data[:total_cents]
     end
   end
   
   describe '#diff' do
     it 'should return the difference between the given pitch, in semitones' do
-      C5.diff(C4).should eq(12)
-      C5.diff(D5).should eq(-2)
-      D5.diff(C5).should eq(2)
+      [
+	[C5,C4,12],
+	[C5,D5,-2],
+	[D5,C5,2],
+	[C5,Pitch.new(octave:5, cent:-5),5/100.0],
+	[A5,Pitch.new(octave:5, semitone: 5, cent: 22),378/100.0],
+	[A5,Pitch.new(octave:5, semitone: 11, cent: 85),-285/100.0],
+      ].each do |a,b,c|
+	a.diff(b).should eq(c)
+      end
     end
   end
   
@@ -62,22 +74,7 @@ describe Pitch do
     it 'should return a Pitch with given ratio' do
       @cases.each do |case_data|
         p = Pitch.from_ratio case_data[:ratio]
-        
-        p.octave.should eq case_data[:octave]
-        p.semitone.should eq case_data[:semitone]
-        p.total_semitone.should eq case_data[:total_semitone]
-      end
-    end
-  end
-
-  describe '.from_semitones' do
-    it 'should return a Pitch with given total semitones' do
-      @cases.each do |case_data|
-        p = Pitch.from_semitones case_data[:total_semitone]
-        
-        p.octave.should eq case_data[:octave]
-        p.semitone.should eq case_data[:semitone]
-        p.total_semitone.should eq case_data[:total_semitone]
+        p.total_cents.should eq case_data[:total_cents]
       end
     end
   end
@@ -146,9 +143,19 @@ describe Pitch do
           { Db0 => "C#0", Eb1 => "D#1", Gb7 => "F#7",
             Ab4 => "G#4", Bb1 => "A#1" }.each do |p,s|
             p.to_s(true).should eq s
-          end          
+          end
         end
       end
     end
+    
+    context 'non-zero cent value' do
+      it 'should append +n (n = cent value)' do
+	{ C0.transpose(0.01) => "C0+1", E1.transpose(0.15) => "E1+15",
+	  G5.transpose(-0.55) => "Gb5+45"
+	}.each do |p,s|
+	  p.to_s.should eq s
+	end
+      end
+    end
   end
 end

data/spec/parsing/articulation_parsing_spec.rb

@@ -5,7 +5,7 @@ describe Parsing::ArticulationParser do
   
   {
     '=' => SLUR,
-    '-' => LEGATO,
+    '|' => LEGATO,
     '_' => TENUTO,
     '%' => PORTATO,
     '.' => STACCATO,

data/spec/parsing/link_nodes_spec.rb

@@ -7,7 +7,7 @@ describe Parsing::LinkNode do
     '=C4' => Link::Slur.new(C4),
     '/Db2' => Link::Portamento.new(Db2),
     '~C#2' => Link::Glissando.new(Db2),
-    '-Db2' => Link::Legato.new(Db2),
+    '|Db2' => Link::Legato.new(Db2),
   }.each do |str,tgt|
     res = parser.parse(str)
     context str do

data/spec/parsing/link_parsing_spec.rb

@@ -5,19 +5,9 @@ describe Parsing::LinkParser do
     @parser = Parsing::LinkParser.new
   end
   
-  it 'should parse a "=C2"' do
-    @parser.parse("=C2").should_not be nil
-  end
-  
-  it 'should parse a "-C2"' do
-    @parser.parse("-C2").should_not be nil
-  end
-  
-  it 'should parse a "~C2"' do
-    @parser.parse("~C2").should_not be nil
-  end
-  
-  it 'should parse a "/C2"' do
-    @parser.parse("/C2").should_not be nil
+  ["=C2","|C2","~C2","/C2"].each do |str|
+    it "should parse #{str}" do
+      @parser.should parse(str)
+    end
   end
 end

data/spec/parsing/note_node_spec.rb

@@ -60,7 +60,7 @@ describe Parsing::NoteNode do
 
   context 'polyphonic note' do
     {
-      '/2C2,D2,E2-F2' => Note.new(Rational(1,2),[C2,D2,E2],links:{E2=>Link::Legato.new(F2)}),
+      '/2C2,D2,E2|F2' => Note.new(Rational(1,2),[C2,D2,E2],links:{E2=>Link::Legato.new(F2)}),
       '4/2.D#6,G4' => Note.new(Rational(4,2),[Eb6,G4], articulation:STACCATO),
       '28_Eb7,D7,G7' => Note.new(Rational(28,1),[Eb7,D7,G7],articulation:TENUTO),
       '56/33B1,B2,B3,B4,B5!' => Note.new(Rational(56,33),[B1,B2,B3,B4,B5], accented: true),

data/spec/parsing/note_parsing_spec.rb

@@ -12,17 +12,17 @@ describe Parsing::NoteParser do
     'duration + articulation + accent' => ['1/4.!','/2%!','2/3=!'],
     'single pitch' => ['/4C2','5/3Db3','/33E#8'],
     'multiple pitches' => ['/4C2,C3,c5','5/3Db3,Bb2,E5','/33E#8,F1,B9'],
-    'with articulation' => ['/4.C2',"5/3'Db3,Bb2,E5",'/33=F3','5-B2','/2_D3,F4'],
+    'with articulation' => ['/4.C2',"5/3'Db3,Bb2,E5",'/33=F3','5|B2','/2_D3,F4'],
     'with accent' => ['/4C2!','3/2Db3,Bb4!'],
-    'with links' => ['/2C2=','/2C2=D2','/4D4-E4,G4~A5'],
+    'with links' => ['/2C2=','/2C2=D2','/4D4|E4,G4~A5'],
     'with single pitch + articulation + link + accent' => [
-      '3/4.D2=!','5/8=F2=!','/8Db4-Db5!','/3_G4~B4!'],
+      '3/4.D2=!','5/8=F2=!','/8Db4|Db5!','/3_G4~B4!'],
     'with multiple pitches + articulation + links + accent' => [
-      '5/4.D2=,G4-A4,C3~D3!','5/8-F2=D4,B4/A4!'],
+      '5/4.D2=,G4|A4,C3~D3!','5/8|F2=D4,B4/A4!'],
   }
   invalid_cases = {
-    'single pitch' => ['/4C22','5/3Hb-3','/33E-2'],
-    'multiple pitches' => ['/4C20,C3,c5','5/3Db3,Bb-1,E5','/33H8,F1,B9'],
+    'single pitch' => ['5/3Hb|3','/33E|2'],
+    'multiple pitches' => ['5/3Db3,Bb|1,E5','/33H8,F1,B9'],
     'with articulation' => ['/4[C2',"5/3>Db3"],
     'with accent' => ['/4C2['],
     'with links' => ['/2C2)'],