music-transcription 0.11.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed4e612a8a80448e988a75202595e4ae4d845f05
-  data.tar.gz: 63bfe1347b0faf23627be072b3ae37b7b674ce94
+  metadata.gz: 2990163ab7471c99ce5b1df3b4899937125d06f7
+  data.tar.gz: 097b4ef37645684ebcf3aac659999f742afc593f
 SHA512:
-  metadata.gz: 8498194327951219f0011f4ad48e68eef2a5a10fcd8781da4f17b4fd40528f7e593d075a18389bf815392c074a6b94d9d8c1dbb7508bb6a693a71e54b64155a8
-  data.tar.gz: b268880e97c17b46128a7f350bbda0fc64f0a4ddbfbd7b9f884d46a32ed0d41ef3091b02899b8fcab16091b0855cb935d9993a1aa717a35960949e44289af86e
+  metadata.gz: 15b1e4dca0a5359ef7cf0bb975da7217c592abae21a770b4004c2037dc12bfe5583ebca5d73517ff928f1061fdddde92a146614bcc73f00acd2f8f37fb9e81d6
+  data.tar.gz: 8453d7fecb15559942a1c8efb42bb0404718b96599e1515497b012f94cc23b5e81aca96307d6921386b9c2856dde122fbdbcb3a3bc5a6718bced2a773793d5a8

data/Rakefile

@@ -38,7 +38,7 @@ task :make_examples do
   Dir.chdir examples_dir
   
   examples = []
-  Dir.glob('**/make*.rb') do |file|
+  Dir.glob('**/*.rb') do |file|
     examples.push File.expand_path(file)
   end
   

data/examples/{make_hip.rb → hip.rb}

@@ -22,6 +22,12 @@ score = Score.new(FOUR_FOUR,120) do |s|
   end
 end
 
-File.open('hip.yml','w') do |file|
+name = File.basename(__FILE__,".rb")
+
+File.open("#{name}.yml", "w") do |file|
   file.write score.to_yaml
-end
+end
+
+File.open("#{name}_packed.yml", "w") do |file|
+  file.write score.pack.to_yaml
+end

data/examples/hip_packed.yml

@@ -0,0 +1,22 @@
+---
+start_meter: 4/4
+meter_changes: {}
+start_tempo: 120
+tempo_changes: {}
+program:
+- 0...2
+- 0...2
+- 2...4
+- 0...2
+parts:
+  lead:
+    notes: /6Bb3 /4 /12Db4= /6Db4= /36Db4 /36Eb4 /36Db4 /6Ab3 /12Db4 /6Bb3 /4 /12Db4=
+      /4Db4= /8=Db4 /8C4 /6C4 /4 /12Eb4= /6Eb4= /36Eb4 /36F4 /36Eb4 /6Bb3 /12Eb4 /6C4
+      /4 /12Eb4= /4Eb4= /8=Eb4 /8D4
+    start_dynamic: 0.625
+    dynamic_changes: {}
+  bass:
+    notes: /6Bb2 /4 /3Ab2 /6F2 /12Ab2 /6Bb2 /4 /3Ab2 /4Ab2 /6C3 /4 /3Bb2 /6G2 /12Bb2
+      /6C3 /4 /3Bb2 /4Bb2
+    start_dynamic: 0.5
+    dynamic_changes: {}

data/examples/{make_missed_connection.rb → missed_connection.rb}

@@ -8,7 +8,7 @@ include Meters
 include Parsing
 
 score = Score.new(FOUR_FOUR, 120) do |s|
-  s.program = Program.new([0..2,0..6])
+  s.program = Program.new([0...2,0...6])
   s.parts["bass"] = Part.new(Dynamics::MF) do |p|
     p.notes =  notes("/4Eb2 /4 /4Bb2 /4 /4Eb2 /8 /8B2 /4Bb2 /4Ab2")
     p.notes += notes("/4Bb2 /8 /8F3= /2F3 /4Bb2 /8 /8F3= /2F3")
@@ -16,6 +16,12 @@ score = Score.new(FOUR_FOUR, 120) do |s|
   end
 end
 
-File.open("missed_connection.yml", "w") do |file|
+name = File.basename(__FILE__,".rb")
+
+File.open("#{name}.yml", "w") do |file|
   file.write score.to_yaml
 end
+
+File.open("#{name}_packed.yml", "w") do |file|
+  file.write score.pack.to_yaml
+end

data/examples/missed_connection.yml

@@ -267,8 +267,8 @@ program: !ruby/object:Music::Transcription::Program
   - !ruby/range
     begin: 0
     end: 2
-    excl: false
+    excl: true
   - !ruby/range
     begin: 0
     end: 6
-    excl: false
+    excl: true

data/examples/missed_connection_packed.yml

@@ -0,0 +1,14 @@
+---
+start_meter: 4/4
+meter_changes: {}
+start_tempo: 120
+tempo_changes: {}
+program:
+- 0...2
+- 0...6
+parts:
+  bass:
+    notes: /4Eb2 /4 /4Bb2 /4 /4Eb2 /8 /8B2 /4Bb2 /4Ab2 /4Bb2 /8 /8F3= /2F3 /4Bb2 /8
+      /8F3= /2F3 /4B2 /8 /8Gb3= /2Gb3 /8 /8Gb3= /2Gb3
+    start_dynamic: 0.625
+    dynamic_changes: {}

data/examples/{make_song1.rb → song1.rb}

@@ -23,6 +23,12 @@ score = Score.new(FOUR_FOUR, 120) do |s|
   end
 end
 
-File.open("song1.yml", "w") do |file|
+name = File.basename(__FILE__,".rb")
+
+File.open("#{name}.yml", "w") do |file|
   file.write score.to_yaml
 end
+
+File.open("#{name}_packed.yml", "w") do |file|
+  file.write score.pack.to_yaml
+end

data/examples/song1_packed.yml

@@ -0,0 +1,19 @@
+---
+start_meter: 4/4
+meter_changes: {}
+start_tempo: 120
+tempo_changes: {}
+program:
+- 0...4.0
+- 0...4.0
+parts:
+  1:
+    notes: 3/8C2 /4Eb2 5/16F2 /16Eb2 /8 /4C2 /4Eb2 3/8 3/8C2 /4Eb2 5/16F2 /16Eb2 /8
+      /4C2 /4Eb2
+    start_dynamic: 0.625
+    dynamic_changes: {}
+  2:
+    notes: /8 /8Bb3 /8Bb3 /8Bb3 /8Bb3 /4C4 /4A3 /8G3 /8F3 5/16=G3 /16=F3 /8E3 /8 /8
+      /8Bb3 /8Bb3 /8Bb3 /8Bb3 /4C4 /8A3 /8E4 /8=E4 /8=D4 /8C4
+    start_dynamic: 0.625
+    dynamic_changes: {}

data/examples/{make_song2.rb → song2.rb}

@@ -22,7 +22,12 @@ score = Score.new(FOUR_FOUR, 120) do |s|
   end
 end
 
-File.open("song2.yml", "w") do |file|
+name = File.basename(__FILE__,".rb")
+
+File.open("#{name}.yml", "w") do |file|
   file.write score.to_yaml
 end
 
+File.open("#{name}_packed.yml", "w") do |file|
+  file.write score.pack.to_yaml
+end

data/examples/song2_packed.yml

@@ -0,0 +1,21 @@
+---
+start_meter: 4/4
+meter_changes: {}
+start_tempo: 120
+tempo_changes: {}
+program:
+- 0...4.0
+- 0...4.0
+parts:
+  1:
+    notes: 1C4 1Bb3 1Ab3 /2G3 /2Bb3
+    start_dynamic: 0.625
+    dynamic_changes: {}
+  2:
+    notes: 3/8E5 1D5 1C5 5/8C5 /2C5 /2D5
+    start_dynamic: 0.625
+    dynamic_changes: {}
+  3:
+    notes: ''
+    start_dynamic: 0.625
+    dynamic_changes: {}

data/lib/music-transcription.rb

@@ -19,8 +19,10 @@ require 'music-transcription/model/meters'
 require 'music-transcription/model/score'
 
 require 'treetop'
-require 'music-transcription/parsing/nonnegative_integer_parsing'
-require 'music-transcription/parsing/positive_integer_parsing'
+require 'music-transcription/parsing/numbers/nonnegative_integer_parsing'
+require 'music-transcription/parsing/numbers/positive_integer_parsing'
+require 'music-transcription/parsing/numbers/nonnegative_float_parsing'
+require 'music-transcription/parsing/numbers/nonnegative_rational_parsing'
 require 'music-transcription/parsing/pitch_parsing'
 require 'music-transcription/parsing/pitch_node'
 require 'music-transcription/parsing/duration_parsing'
@@ -29,6 +31,12 @@ require 'music-transcription/parsing/articulation_parsing'
 require 'music-transcription/parsing/link_parsing'
 require 'music-transcription/parsing/link_nodes'
 require 'music-transcription/parsing/note_parsing'
-require 'music-transcription/parsing/note_nodes'
+require 'music-transcription/parsing/note_node'
 require 'music-transcription/parsing/meter_parsing'
+require 'music-transcription/parsing/segment_parsing'
 require 'music-transcription/parsing/convenience_methods'
+
+require 'music-transcription/packing/change_packing'
+require 'music-transcription/packing/part_packing'
+require 'music-transcription/packing/program_packing'
+require 'music-transcription/packing/score_packing'

data/lib/music-transcription/model/link.rb

@@ -21,13 +21,16 @@ class Link
     def transpose! diff
       # do nothing, of course
     end
+    
+    def to_s; "="; end
   end
   
   class TargetedLink < Link
-    attr_accessor :target_pitch
+    attr_accessor :target_pitch, :link_char
     
-    def initialize target_pitch
+    def initialize target_pitch, link_char
       @target_pitch = target_pitch
+      @link_char = link_char
     end
     
     def ==(other)
@@ -37,12 +40,27 @@ class Link
     def transpose! diff
       @target_pitch += diff
     end
+    
+    def to_s
+      @link_char + @target_pitch.to_s
+    end
+  end
+  
+  class Glissando < TargetedLink
+    def initialize(target_pitch); super(target_pitch,"~"); end
   end
   
-  class Glissando < TargetedLink; end
-  class Portamento < TargetedLink; end
-  class Slur < TargetedLink; end
-  class Legato < TargetedLink; end
+  class Portamento < TargetedLink
+    def initialize(target_pitch); super(target_pitch,"/"); end
+  end
+  
+  class Slur < TargetedLink
+    def initialize(target_pitch); super(target_pitch,"="); end
+  end
+  
+  class Legato < TargetedLink
+    def initialize(target_pitch); super(target_pitch,"-"); end
+  end
 end
 
 end

data/lib/music-transcription/model/meter.rb

@@ -36,6 +36,16 @@ class Meter
     return (@beats_per_measure == other.beats_per_measure &&
       @beat_duration == other.beat_duration)
   end
+  
+  def to_s
+    if beat_duration.numerator == 1
+      num = beats_per_measure * beat_duration.numerator
+      den = beat_duration.denominator
+      "#{num}/#{den}"
+    else
+      "#{beats_per_measure}*#{beat_duration}"
+    end
+  end
 end
 
 end

data/lib/music-transcription/model/meters.rb

@@ -5,7 +5,7 @@ module Meters
   TWO_FOUR = Meter.new(2,"1/4".to_r)
   THREE_FOUR = Meter.new(3,"1/4".to_r)
   FOUR_FOUR = Meter.new(4,"1/4".to_r)
-  SIX_EIGHT = Meter.new(6,"1/8".to_r)
+  SIX_EIGHT = Meter.new(2,"3/8".to_r)
 end
 end
 end

data/lib/music-transcription/model/note.rb

@@ -65,6 +65,38 @@ class Note
     @duration *= ratio
     return self
   end
+  
+  def to_s
+    d = @duration.to_r
+    if d.denominator == 1
+      dur_str = "#{d.numerator}"
+    elsif d.numerator == 1
+      dur_str = "/#{d.denominator}"
+    else
+      dur_str = d.to_s
+    end
+    
+    art_str = case @articulation
+    when Articulations::SLUR then "="
+    when Articulations::LEGATO then "-"
+    when Articulations::TENUTO then "_"
+    when Articulations::PORTATO then "%"
+    when Articulations::STACCATO then "."
+    when Articulations::STACCATISSIMO then "'"
+    else ""
+    end
+    
+    pitch_links_str = @pitches.map do |p|
+      if @links.has_key?(p)
+        p.to_s + @links[p].to_s
+      else
+        p.to_s
+      end
+    end.join(",")
+    
+    acc_str = @accented ? "!" : ""
+    return dur_str + art_str + pitch_links_str + acc_str
+  end
 
   def self.add_note_method(name, dur)
     self.class.send(:define_method,name.to_sym) do |pitches = [], articulation: DEFAULT_ARTICULATION, links: {}, accented: false|

data/lib/music-transcription/model/pitch.rb

@@ -150,6 +150,25 @@ class Pitch
     return self
   end
   
+  def to_s(sharpit = false)
+    letter = case semitone
+    when 0 then "C"
+    when 1 then sharpit  ? "C#" : "Db"
+    when 2 then "D"
+    when 3 then sharpit  ? "D#" : "Eb"
+    when 4 then "E"
+    when 5 then "F"
+    when 6 then sharpit  ? "F#" : "Gb"
+    when 7 then "G"
+    when 8 then sharpit  ? "G#" : "Ab"
+    when 9 then "A"
+    when 10 then sharpit  ? "A#" : "Bb"
+    when 11 then "B"
+    end
+    
+    return letter + octave.to_s
+  end
+  
   def self.make_from_freq(freq)
     pitch = Pitch.new()
     pitch.ratio = freq / BASE_FREQ

data/lib/music-transcription/packing/change_packing.rb

@@ -0,0 +1,27 @@
+module Music
+module Transcription
+
+class Change
+  class Immediate < Change
+    def pack
+      [ @value ]
+    end
+  end
+  
+  class Gradual < Change
+    def pack
+      [ @value, @duration ]
+    end
+  end
+
+  def self.unpack packing
+    case packing.size
+    when 1 then Immediate.new(*packing)
+    when 2 then Gradual.new(*packing)
+    else raise ArgumentError, "bad array size"
+    end
+  end
+end
+
+end
+end

data/lib/music-transcription/packing/part_packing.rb

@@ -0,0 +1,33 @@
+module Music
+module Transcription
+
+class Part
+  def pack
+    packed_notes = notes.map {|n| n.to_s }.join(" ")
+    packed_dcs = Hash[ dynamic_changes.map do |offset,change|
+      [ offset, change.pack ]
+    end ]
+      
+    {
+      'notes' => packed_notes,
+      'start_dynamic' => start_dynamic,
+      'dynamic_changes' => packed_dcs
+    }
+  end
+  
+  def self.unpack packing
+    unpacked_notes = Parsing::notes(packing["notes"])
+    unpacked_dcs = Hash[ packing["dynamic_changes"].map do |offset,change|
+      [ offset,Change.unpack(change) ]
+    end ]
+    
+    new(
+      packing["start_dynamic"],
+      notes: unpacked_notes,
+      dynamic_changes: unpacked_dcs
+    )
+  end
+end
+
+end
+end

data/lib/music-transcription/packing/program_packing.rb

@@ -0,0 +1,18 @@
+module Music
+module Transcription
+
+class Program
+  def pack
+    @segments.map do |seg|
+      seg.to_s
+    end
+  end
+  
+  def self.unpack packing
+    segments = packing.map {|str| Parsing::segment(str) }
+    new segments
+  end
+end
+
+end
+end