smml 0.0.2 → 0.0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9e4b5e286515548fd779124d93a0e4af0033544
-  data.tar.gz: 1d03edbde6611b9765734e39876c150bbd18174e
+  metadata.gz: bcdb4cdf683202fd9ce136fe9bb0bd3b9dee193c
+  data.tar.gz: 9a25de640dc26ec8f16939926de7cebaaeccdcf4
 SHA512:
-  metadata.gz: a4594fbee45fd10fc83d777f96771f6a9c8f661bd6ff8de91530798541ae6c3f072aff4a62c8e2104720c9bfe3e1d05154e494391359a42e64d1e8f867832df8
-  data.tar.gz: 16ac496ecb4c88b4d357371dd02efd3f4f67b6e65b7d478415f1aab981a893ed273a961b1a4d3ba6181a8aca52265c10040ed95b8c11318547818d9d22d82f44
+  metadata.gz: eefd12ba06b4d3b1070d8d81523b1d7d3dbb52926c05c6708d7045110927a8b1b8b280d411d60dc6ac914a91296470f769564ff0ce5c29a1d261edca7dc2cb08
+  data.tar.gz: 7c034b35c71bf8965d5cb9dae4296206e8f1fe7f9ee3b2d91638c0cedf6acfe0ba74a90e83396d51708f3daa62cc32aaad086504082bf8a6988adbb4b7b8d999

data/lib/smml/msm.rb

@@ -1463,6 +1463,7 @@ module MidiHex
     @systemWait=120
     @h=[]
     wait=[]
+    lastwait=[]
     @frest=0
     @frestc=0
     @nowtime=0
@@ -1511,6 +1512,7 @@ module MidiHex
             @h<<[:rest,t]
           end
         }
+        lastwait=wait
         wait=[]
         accent=false
         sharp=0
@@ -1699,7 +1701,11 @@ module MidiHex
         p "accent" if $DEBUG
         accent=true
       when "="
-        @h<<@h[-1]
+        if lastwait.size>0
+          wait+=lastwait
+        else
+          @h<<@h[-1]
+        end
       when "r"
         wait<<[:rest,i]
       when "o"
@@ -1862,23 +1868,23 @@ def multiplet d,tbase
   else
     total=tbase*rate
   end
-  r=i.scan(/\(\?:[^\]]+\)|\(x:[^\]]+\)|\(chord:[^)]+\)|\(C:[^)]+\)|:[^\(,]+\([^\)]+\),|:[^,]+,|[[:digit:]\.]+|_[^!]+!|~|\([-+]*[[:digit:]]?\)|[-+^`']|./)
+  r=i.scan(/=|\(\?:[^\]]+\)|\(x:[^\]]+\)|\(chord:[^)]+\)|\(C:[^)]+\)|:[^\(,]+\([^\)]+\),|:[^,]+,|[[:digit:]\.]+|_[^!]+!|~|\([-+]*[[:digit:]]?\)|[-+^`'<>]|./)
   wait=[]
   notes=[]
   mod=[]
   r.each{|i|
     case i
-    when "-","+","^","`","'",/^\([-+]*[[:digit:]]?\)/
+    # modifier
+    when /^[-+^`',<>]/,/^\([-+]*[[:digit:]]?\)/
       mod<<i
-    when /^\((\?|x|C|chord):[^\)]+\)|^\^?:[^,]+,/
+    # note
+    when /^\((\?|x|C|chord):[^\)]+\)|^\^?:[^,]+,|^=/
       wait<<1
       notes<<"#{mod*""}#{i}"
       mod=[]
+    # length
     when /^[[:digit:]]+/
       wait[-1]*=i.to_f
-    when "="
-      wait<<wait[-1]
-      notes<<notes[-1]
     when " "
     else
       wait<<1

data/lib/smml/version.rb

@@ -1,3 +1,3 @@
 module Smml
-  VERSION = "0.0.2"
+  VERSION = "0.0.2.3"
 end

data/sample/midi-test.mml

@@ -1,7 +1,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  
  for CI test script.
- ver. 1.0
+ ver. 1.1
  
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
@@ -9,7 +9,9 @@
 t:=abcde
 tt(x):=ee$xff
 
-a`b'cd (stroke:86) [ef{e,f,g}g_c!:cmaj7,<(stroke:3)]4>>>> (p:flut)(g:80)[/2:aAbcCdef/(g:20)-]2 (bendCent:off)[c(bend:200.2)/cc/(bend:0)c(bendCent:on)]2 (mark:tes)/2:c2gc/ (g:100) f*240e*120d*60 --(p:organ) $t (+3)a(+)b(0)c $tt(4:1,2,3)
+a`b'cd (stroke:86) [ef{e,f,g}g_c!:cmaj7,<(stroke:3)]4>>>> (p:flut)(g:80)[/2:aAbcCdef/(g:20)-]2
+ (bendCent:off)[c(bend:200.2)/cc/(bend:0)c(bendCent:on)]2
+ (mark:tes)(p:guit)/2:c2gc/[/2:~{e,g}=f/] (g:100) f*240e*120d*60 --(p:organ) $t (+3)a(+)b(0)c $tt(4:1,2,3)
 
 
 //////////////////////////////////////////////////////////////////////

data/smml.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |spec|
   spec.files         = Dir.glob("lib/*")+Dir.glob("lib/smml/*")+["Gemfile","Rakefile","LICENSE.txt","smml.gemspec","README_smml.md"]+["sample/midi-preModifier.txt","sample/midi-test.mml"]
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.extra_rdoc_files =%w[README_smml.md LICENSE.txt]
   spec.require_paths = ["lib"]
   spec.required_ruby_version = '>= 1.8.7' 
   spec.add_development_dependency "bundler", "~> 1.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smml
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.2.3
 platform: ruby
 authors:
 - tabasano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2014-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -43,7 +43,9 @@ email:
 - pianotoieba+smml@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- README_smml.md
+- LICENSE.txt
 files:
 - lib/smml.rb
 - lib/smml/midi-percussion-map.txt