mml2wav 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06613389b80c23f0feceb9a329027156ffdfa049
-  data.tar.gz: c885d9a54797cfe5a73c1e7b25dc6107b6bb3a4d
+  metadata.gz: 4cbdd2cc35197a65e4d8065938b269a33107958e
+  data.tar.gz: a5520c6bab70019d406db2768480202c7a283b92
 SHA512:
-  metadata.gz: 6c5d0613578307b8dc99cd947de6f7aab9c5e4bf42a2d4f0674a9bcca81c5b4238ae43a7f4f4ffe4d10e22c7e7bd88922ebb2e18df983f683e89391cc337abc6
-  data.tar.gz: 18ab290f8e4b791855cd7ac65f5532632063c759f09b0d5a0d40eb8b521e605a420c374724c3d3502e13c0a907f55350b7f333991a5bef40238b5696bc8f7cb7
+  metadata.gz: 6a4a662e1be6f29c0436fc9b4719497428f829be31f5ca88ba9fd94954bcfcc8c671a59563d375cde177e6c668709c8c647f04dfff7170dab80edddbaeb4018a
+  data.tar.gz: 6948108039e53bb0c81bf7a596423fd38643983f8f69d3ecb22f553ab585e0b0bf5e82d26e70a2b438b8d1a0d6f79ff366f1824b5662c343b6f0e9e49e731ad7

data/NEWS.md

@@ -0,0 +1,12 @@
+# NEWS
+
+## 0.0.5: 2015-05-03
+
+### Improvements
+
+* Supported tie.
+
+### Fixes
+
+* Supported length for rest.
+* Supported dot without length.

data/lib/mml2wav/parser.rb

@@ -3,7 +3,7 @@ require "mml2wav/scale"
 module Mml2wav
   class Parser
     def initialize(sounds, sampling_rate, options={})
-      pattern = /T\d+|V\d+|L\d+|[A-G][#+-]?\d*\.?|O\d+|[><]|./i
+      pattern = /T\d+|V\d+|L\d+|[A-GR][#+-]?\d*\.?(?:&[A-GR][#+-]?\d*\.?)*|O\d+|[><]|./i
       @sounds = sounds.scan(pattern)
       @sampling_rate = sampling_rate
       @bpm = options[:bpm] || 120
@@ -22,22 +22,40 @@ module Mml2wav
         case sound
         when /\AT(\d+)/i
           @bpm = $1.to_i
+          next
         when /\AV(\d+)/i
           @velocity = $1.to_i
+          next
         when /\AL(\d+)/i
           @default_length = $1.to_f
-        when /\A([A-G][#+-]?)(\d+)(\.)?/i
-          length = $2.to_f
+          next
+        when /\A([A-GR][#+-]?)(\d+)?(\.)?((?:&[A-GR][#+-]?\d*\.?)*)/i
           sound = $1
-          length = @default_length / 1.5 if $3
+          length = $2.to_f if $2
+          length /= 1.5 if $3
+          sec = base_sec / length / @bpm
+          if $4
+            $4.scan(/&[A-GR][#+-]?(\d+)?(\.)?/i).each do |len, dot|
+              if len
+                sub_length = len.to_f
+              else
+                sub_length = @default_length
+              end
+              sub_length /= 1.5 if dot
+              sub_sec = base_sec / sub_length / @bpm
+              sec += sub_sec
+            end
+          end
         when /\AO(\d+)/i
           @octave = $1.to_i
+          next
         when "<"
           @octave += @octave_reverse ? -1 : 1
+          next
         when ">"
           @octave -= @octave_reverse ? -1 : 1
+          next
         end
-        sec = base_sec / length / @bpm
         amplitude = @velocity.to_f / 10
         frequency = Scale::FREQUENCIES[sound.downcase]
         next unless frequency

data/lib/mml2wav/version.rb

@@ -1,3 +1,3 @@
 module Mml2wav
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mml2wav
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Masafumi Yokoyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wavefile
@@ -63,6 +63,7 @@ files:
 - ".gitignore"
 - Gemfile
 - LICENSE.txt
+- NEWS.md
 - README.md
 - Rakefile
 - bin/mml2wav