smml 0.0.1.2 → 0.0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bf2824c9bd756298a61dd85c3ba78c2adef2528
-  data.tar.gz: f54b53bffa1e535c2da4a4b7a1064b0bb7e6baf1
+  metadata.gz: 67aa246a5209bbc55a5ba1356a63ef39b10c87bc
+  data.tar.gz: 696a7e1b9642fb167bc719a2a04e4d425e866a34
 SHA512:
-  metadata.gz: 49195b2fe4dc36160ec7b8cfd8701796555bb15f0c48ffade3b085348537b644251da15af74fe06531622b2fee1f8ecae6f813d9d981992a0290a7f222802ef0
-  data.tar.gz: 8802d8ed531d9e38d5472a051920d38b53ce2ae9544840d815ad732c37d67534d00a031b53dc023125142b922c4276dcffacd4b670edde6a01a47b659a61a1f0
+  metadata.gz: 1a93e8f14b8ea8d1a4147601989e4e7777be71f07b63c7bd0e118291d50c6224b9e970327b6c554c078d4f923594496b1065359f2dd3577709b7ac2579e99f24
+  data.tar.gz: dd1dc625e001fdf571cd8bb5dfd10c75c7becff2961a7e9c0248968181da89295fa53fd5a7b2936b5bc8fdde4ff425923868e4a21a20ff22e31e785f1f524448

data/README_smml.md

@@ -0,0 +1,32 @@
+# Smml
+
+simple Music Macro Language to MIDI
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'smml'
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install smml
+
+## Usage
+
+    m=MmlTracks.new
+    m.compile('infile.mml','outfile.mid')
+
+## Contributing
+
+1. Fork it ( https://github.com/[my-github-username]/smml/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create a new Pull Request

data/lib/smml/msm.rb

@@ -67,6 +67,7 @@ syntax: ...( will be changed time after time)
     (syswait:) =when using '(gm:on)' etc., this command is needed for all other tracks to adjust wait-time.
     ||| = track separater
     /// = page separater
+          series of page seperaters insert unique '(mark:all track mark)' to allready running tracks automaticaly.
     (mark:posname) =position name for adjustment of tracks after long rest etc.
     .DC .DS .toCODA .CODA .FINE =coda mark etc.
     .SKIP =skip mark on over second time
@@ -128,6 +129,9 @@ def multilineTrim l,com
   puts " ? mismatch end mark of multiline comment."  if on
   r
 end
+def allTrackMark c
+  "(mark:.ALL_TRACK_MARK_#{c}.)"
+end
 class String
   def setcmark c
     @@cmark=c
@@ -144,17 +148,24 @@ class String
   def sharp2cmark
     self.gsub!("#"){@@cmark}
   end
-  def tracks pspl
+  def tracksep pspl
     tracks={}
     pages=self.split(/#{pspl}+/)
+    markc=0
     pages.each{|p|
-      p.split('|||').each_with_index{|t,i|
-        if tracks[i]
-          tracks[i] << t
-        else
-          tracks[i] = [t]
-        end
-      }
+      if p=~/^[ ;]+$/
+        p=allTrackMark(markc)
+        tracks.values.each{|v| v << p }
+        markc+=1
+      else
+        p.split('|||').each_with_index{|t,i|
+          if tracks[i]
+            tracks[i] << t
+          else
+            tracks[i] = [t]
+          end
+        }
+      end
     }
     tracks.keys.sort.map{|k|tracks[k]*";"}
   end
@@ -2151,7 +2162,7 @@ end
 class MmlTracks
   attr_accessor :tracknum, :tbase, :rundatas, :rawdatas, :mx
   attr_accessor :bpm, :velocity, :octave, :vfuzzy, :data, :infile, :outfile
-  def initialize tbase=480,pagesep='///',expfile='expfile.txt',cmark=';;'
+  def initialize tbase=480,pagesep='///',expfile=false,cmark=';;'
     String.new.setcmark(cmark)
     @mx=MidiHex
     @rundatas=[]
@@ -2175,7 +2186,7 @@ class MmlTracks
     @mx.setdata(@data) if ! @mx.getdata
     (hint;exit) if (! @mx.getdata || ! @mx.getmidiname ) && ! test
     settest if test
-    @tracks=@mx.getdata.tracks(@pagesep)
+    @tracks=@mx.getdata.tracksep(@pagesep)
     showtracks if $DEBUG && $debuglevel>1
     fuzzy(fz)
   end

data/lib/smml/version.rb

@@ -1,3 +1,3 @@
 module Smml
-  VERSION = "0.0.1.2"
+  VERSION = "0.0.1.3"
 end

data/smml.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = ""
   spec.license       = "MIT"
 
-  spec.files         = Dir.glob("lib/*")+Dir.glob("lib/smml/*")+["Gemfile","Rakefile","LICENSE.txt","smml.gemspec"]
+  spec.files         = Dir.glob("lib/*")+Dir.glob("lib/smml/*")+["Gemfile","Rakefile","LICENSE.txt","smml.gemspec","README_smml.md"]
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smml
 version: !ruby/object:Gem::Version
-  version: 0.0.1.2
+  version: 0.0.1.3
 platform: ruby
 authors:
 - tabasano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-16 00:00:00.000000000 Z
+date: 2014-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -54,6 +54,7 @@ files:
 - Rakefile
 - LICENSE.txt
 - smml.gemspec
+- README_smml.md
 homepage: ''
 licenses:
 - MIT