music-transcription 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b7b17820849b85c63d55bd0ddac48b10c53e86c
-  data.tar.gz: 7ba98c1ae18ea8b6631d8a2c40ffb55525fbe3f4
+  metadata.gz: 8d21073b4a61467ca784ffae3482346e9c0d34b3
+  data.tar.gz: 381efdae0c02c9dcf0700f21ee5462accd5d5db3
 SHA512:
-  metadata.gz: 36033a773afaf9999d7601236093bab72d71e5a639373de670431b563c23a07329a00ea61d8e70edd9c3f5d129e6bb118d6551466fb2468e8b4fc4e366d13b32
-  data.tar.gz: 224776f667078ff2fe8f3fd6aafd262aad382e6d487c27c35da9a5caab3dfbbb5b6c6755cc602b1c616fd7da8713e4d2b14997f4bfb1d8c7a9bedb0b65400a68
+  metadata.gz: 6d27840fc552267e4327afd0c25238ec1cc48972192ed90643046b0980ec31f70be9e3a4d8f4f43b77fe23988a33b0186b6fe7b6d0b5b28d5492015c49de0d63
+  data.tar.gz: 1750142a012d3314e102157689d4e146ca63c35d6762bf2b02173b549c750ed56c2e8820cda0a930942647a2be6878c58ab99a936207578160ad6575b9f130ff

data/Rakefile

@@ -52,3 +52,37 @@ task :make_examples do
 
   Dir.chdir current_dir
 end
+
+def rb_fname fname
+  basename = File.basename(fname, File.extname(fname))
+  dirname = File.dirname(fname)
+  "#{dirname}/#{basename}.rb"
+end
+  
+task :build_parsers do
+  wd = Dir.pwd
+  Dir.chdir "lib/music-transcription/parsing"
+  parser_files = Dir.glob(["**/*.treetop","**/*.tt"])
+  
+  if parser_files.empty?
+    puts "No parsers found"
+    return
+  end
+
+  build_list = parser_files.select do |fname|
+    rb_name = rb_fname(fname)
+    !File.exists?(rb_name) || (File.mtime(fname) > File.mtime(rb_name))
+  end
+  
+  if build_list.any?
+    puts "building parsers:"
+    build_list.each do |fname|
+      puts "  #{fname} -> #{rb_fname(fname)}"
+      `tt -f #{fname}`
+    end
+  else
+    puts "Parsers are up-to-date"
+  end
+  Dir.chdir wd
+end
+task :spec => :build_parsers

data/lib/music-transcription/change.rb

@@ -18,8 +18,8 @@ class Change
   class Immediate < Change
     include Validatable
     
+    @@check_methods = [ :ensure_zero_duration ]
     def initialize value
-      @check_methods = [ :ensure_zero_duration ]
       super(value,0)
     end
     
@@ -33,8 +33,8 @@ class Change
   class Gradual < Change
     include Validatable
     
+    @@check_methods = [ :ensure_nonnegative_duration ]
     def initialize value, transition_duration
-      @check_methods = [ :ensure_nonnegative_duration ]
       super(value, transition_duration)
     end
     

data/lib/music-transcription/meter.rb

@@ -3,14 +3,13 @@ module Transcription
 
 class Meter
   include Validatable
-  
   attr_reader :measure_duration, :beat_duration, :beats_per_measure
+  
+  @@check_methods = [ :check_beats_per_measure, :check_beat_duration ]
   def initialize beats_per_measure, beat_duration
     @beats_per_measure = beats_per_measure
     @beat_duration = beat_duration
-    @measure_duration = beats_per_measure * beat_duration
-    
-    @check_methods = [ :check_beats_per_measure, :check_beat_duration ]
+    @measure_duration = beats_per_measure * beat_duration    
   end
   
   def check_beats_per_measure

data/lib/music-transcription/note.rb

@@ -11,14 +11,13 @@ class Note
 
   DEFAULT_ARTICULATION = Articulations::NORMAL
   
+  @@check_methods = [ :ensure_positive_duration ]
   def initialize duration, pitches = [], articulation: DEFAULT_ARTICULATION, accented: false, links: {}
     @duration = duration
     @pitches = Set.new(pitches).sort
     @articulation = articulation
     @accented = accented
     @links = links
-    
-    @check_methods = [ :ensure_positive_duration ]
   end
   
   def ensure_positive_duration

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

@@ -0,0 +1,266 @@
+# Autogenerated from a Treetop grammar. Edits may be lost.
+
+
+module Music
+module Transcription
+module Parsing
+
+module Articulation
+  include Treetop::Runtime
+
+  def root
+    @root ||= :articulation
+  end
+
+  def _nt_articulation
+    start_index = index
+    if node_cache[:articulation].has_key?(index)
+      cached = node_cache[:articulation][index]
+      if cached
+        node_cache[:articulation][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0 = index
+    r1 = _nt_slur
+    if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
+      r0 = r1
+    else
+      r2 = _nt_legato
+      if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
+        r0 = r2
+      else
+        r3 = _nt_tenuto
+        if r3
+          r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
+          r0 = r3
+        else
+          r4 = _nt_portato
+          if r4
+            r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
+            r0 = r4
+          else
+            r5 = _nt_staccato
+            if r5
+              r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
+              r0 = r5
+            else
+              r6 = _nt_staccatissimo
+              if r6
+                r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
+                r0 = r6
+              else
+                @index = i0
+                r0 = nil
+              end
+            end
+          end
+        end
+      end
+    end
+
+    node_cache[:articulation][start_index] = r0
+
+    r0
+  end
+
+  module Slur0
+    def to_articulation
+      Music::Transcription::Articulations::SLUR
+    end
+  end
+
+  def _nt_slur
+    start_index = index
+    if node_cache[:slur].has_key?(index)
+      cached = node_cache[:slur][index]
+      if cached
+        node_cache[: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(Slur0)
+      @index += match_len
+    else
+      terminal_parse_failure("=")
+      r0 = nil
+    end
+
+    node_cache[:slur][start_index] = r0
+
+    r0
+  end
+
+  module Legato0
+    def to_articulation
+      Music::Transcription::Articulations::LEGATO
+    end
+  end
+
+  def _nt_legato
+    start_index = index
+    if node_cache[:legato].has_key?(index)
+      cached = node_cache[:legato][index]
+      if cached
+        node_cache[:legato][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(Legato0)
+      @index += match_len
+    else
+      terminal_parse_failure("-")
+      r0 = nil
+    end
+
+    node_cache[:legato][start_index] = r0
+
+    r0
+  end
+
+  module Tenuto0
+    def to_articulation
+      Music::Transcription::Articulations::TENUTO
+    end
+  end
+
+  def _nt_tenuto
+    start_index = index
+    if node_cache[:tenuto].has_key?(index)
+      cached = node_cache[:tenuto][index]
+      if cached
+        node_cache[:tenuto][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(Tenuto0)
+      @index += match_len
+    else
+      terminal_parse_failure("_")
+      r0 = nil
+    end
+
+    node_cache[:tenuto][start_index] = r0
+
+    r0
+  end
+
+  module Portato0
+    def to_articulation
+      Music::Transcription::Articulations::PORTATO
+    end
+  end
+
+  def _nt_portato
+    start_index = index
+    if node_cache[:portato].has_key?(index)
+      cached = node_cache[:portato][index]
+      if cached
+        node_cache[:portato][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(Portato0)
+      @index += match_len
+    else
+      terminal_parse_failure("%")
+      r0 = nil
+    end
+
+    node_cache[:portato][start_index] = r0
+
+    r0
+  end
+
+  module Staccato0
+    def to_articulation
+      Music::Transcription::Articulations::STACCATO
+    end
+  end
+
+  def _nt_staccato
+    start_index = index
+    if node_cache[:staccato].has_key?(index)
+      cached = node_cache[:staccato][index]
+      if cached
+        node_cache[:staccato][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(Staccato0)
+      @index += match_len
+    else
+      terminal_parse_failure(".")
+      r0 = nil
+    end
+
+    node_cache[:staccato][start_index] = r0
+
+    r0
+  end
+
+  module Staccatissimo0
+    def to_articulation
+      Music::Transcription::Articulations::STACCATISSIMO
+    end
+  end
+
+  def _nt_staccatissimo
+    start_index = index
+    if node_cache[:staccatissimo].has_key?(index)
+      cached = node_cache[:staccatissimo][index]
+      if cached
+        node_cache[:staccatissimo][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(Staccatissimo0)
+      @index += match_len
+    else
+      terminal_parse_failure("'")
+      r0 = nil
+    end
+
+    node_cache[:staccatissimo][start_index] = r0
+
+    r0
+  end
+
+end
+
+class ArticulationParser < Treetop::Runtime::CompiledParser
+  include Articulation
+end
+
+
+end
+end
+end

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

@@ -0,0 +1,61 @@
+module Music
+module Transcription
+module Parsing
+
+grammar Articulation
+  rule articulation
+    slur / legato / tenuto / portato / staccato / staccatissimo
+  end
+  
+  rule slur
+    "=" {
+      def to_articulation
+        Music::Transcription::Articulations::SLUR
+      end
+    }
+  end
+
+  rule legato
+    "-" {
+      def to_articulation
+        Music::Transcription::Articulations::LEGATO
+      end
+    }
+  end
+  
+  rule tenuto
+    "_" {
+      def to_articulation
+        Music::Transcription::Articulations::TENUTO
+      end
+    }
+  end
+  
+  rule portato
+    "%" {
+      def to_articulation
+        Music::Transcription::Articulations::PORTATO
+      end
+    }
+  end
+
+  rule staccato
+    "." {
+      def to_articulation
+        Music::Transcription::Articulations::STACCATO
+      end
+    }
+  end
+  
+  rule staccatissimo
+    "'" {
+      def to_articulation
+        Music::Transcription::Articulations::STACCATISSIMO
+      end
+    }
+  end
+end
+
+end
+end
+end

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

@@ -0,0 +1,83 @@
+module Music
+module Transcription
+module Parsing
+  DURATION_PARSER = DurationParser.new
+  PITCH_PARSER = PitchParser.new
+  NOTE_PARSER = NoteParser.new
+  
+  def duration dur_str
+    DURATION_PARSER.parse(dur_str).to_r
+  end
+  alias :dur :duration
+  module_function :duration
+  module_function :dur
+  
+  def durations durs_str
+    durs_str.split.map do |dur_str|
+      duration(dur_str)
+    end
+  end
+  alias :durs :durations
+  module_function :durs
+  module_function :durations
+  
+  def pitch p_str
+    PITCH_PARSER.parse(p_str).to_pitch
+  end
+  module_function :pitch
+
+  def pitches ps_str
+    ps_str.split.map do |p_str|
+      pitch(p_str)
+    end
+  end
+  module_function :pitches
+  
+  def note note_str
+    NOTE_PARSER.parse(note_str).to_note
+  end
+  module_function :note
+  
+  def notes notes_str
+    notes_str.split.map do |note_str|
+      note(note_str)
+    end
+  end
+  module_function :notes
+end
+end
+end
+
+class String
+  def to_duration
+    Music::Transcription::Parsing::duration(self)
+  end
+  alias :to_dur :to_duration
+  alias :to_d :to_duration
+  
+  def to_durations
+    Music::Transcription::Parsing::durations(self)
+  end
+  alias :to_durs :to_durations
+  alias :to_ds :to_durations
+  
+  def to_pitch
+    Music::Transcription::Parsing::pitch(self)
+  end
+  alias :to_p :to_pitch
+  
+  def to_pitches
+    Music::Transcription::Parsing::pitches(self)
+  end
+  alias :to_ps :to_pitches
+  
+  def to_note
+    Music::Transcription::Parsing::note(self)
+  end
+  alias :to_n :to_note
+  
+  def to_notes
+    Music::Transcription::Parsing::notes(self)
+  end
+  alias :to_ns :to_notes
+end