smml 0.0.1.3 → 0.0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67aa246a5209bbc55a5ba1356a63ef39b10c87bc
-  data.tar.gz: 696a7e1b9642fb167bc719a2a04e4d425e866a34
+  metadata.gz: 75ff5842372ded20636c957cecf250fd9281aeaa
+  data.tar.gz: 9fa770527ddb702083efc7e8fadf3de322d2018c
 SHA512:
-  metadata.gz: 1a93e8f14b8ea8d1a4147601989e4e7777be71f07b63c7bd0e118291d50c6224b9e970327b6c554c078d4f923594496b1065359f2dd3577709b7ac2579e99f24
-  data.tar.gz: dd1dc625e001fdf571cd8bb5dfd10c75c7becff2961a7e9c0248968181da89295fa53fd5a7b2936b5bc8fdde4ff425923868e4a21a20ff22e31e785f1f524448
+  metadata.gz: 85190158c8daf8d4348b4b9a3bdab554296646d2177cd461cea9b31906b27c3595e23b7d12e4bb35a134f232c0822949eeb04271b873fff81e9c250aca2e03c3
+  data.tar.gz: aaad50efe9d52991caf0742f0144091cd4f407f8bb51feb14a91fe3cf1a91a07494c573e0bbbb0ee9c924682855174b311ef23a702f7af8268dc03d40b42728a

data/README_smml.md

@@ -4,6 +4,9 @@ simple Music Macro Language to MIDI
 
 ## Installation
 
+
+[![Gem Version](https://badge.fury.io/rb/smml.svg)](http://badge.fury.io/rb/smml)
+
 Add this line to your application's Gemfile:
 
 ```ruby

data/lib/smml/msm.rb

@@ -39,6 +39,7 @@ syntax: ...( will be changed time after time)
     (ch:1)      =set this track's channel 1
     (cc:10,64) =controlChange number10 value 64. see SMF format.
     (pan:>64)  =panpot right 64. ( pan:>0  set center )
+    (oct:2)      =set octave 2
     (bend:100)     =pitch bend 100
     (bendRange:12) =set bend range 12. default is normaly 2.
     (bendCent:on)  =set bend value unit cent (half tone = 100). default is 'off' and value is between -8192 and +8192.
@@ -1530,6 +1531,9 @@ module MidiHex
         @h<<[:call,:preBefore,s]
       when /^\(roll:(.*)\)/
         @shiftbase=$1.to_i
+      when /^\(oct(ave)?:(.*)\)/
+        oct=($2.to_i+2)*12
+        @h<<[:call,:basekeySet,oct]
       when /^\(key:reset\)/
         @h<<[:call,:basekeySet,@basekeyOrg]
       when /^\(p:(([[:digit:]]+),)?(([[:digit:]]+)|([\?[:alnum:]]+)(,([[:digit:]]))?)\)/
@@ -1572,8 +1576,9 @@ module MidiHex
         @h<<[:velocityFuzzy,$1.to_i]
       when /^\(v:([0-9]+)\)/, /^v([0-9]+)/
         @h<<[:velocity,$1.to_i]
-      when /^\(g:([0-9]+)\)/
-        @h<<[:call,:setGateRate,$1.to_i]
+      when /^\(g(ate)?:([0-9]+)\)/
+        g=$2.to_i
+        @h<<[:call,:setGateRate,g]
       when /^\(volume:(.*)\)/
         @h<<[:masterVolume,$1.to_i]
       when /^\(tempo:reset\)/

data/lib/smml/version.rb

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

data/sample/midi-preModifier.txt

@@ -0,0 +1,87 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; comment start
+
+   this is a comment.
+   free for newline
+   multi line comment.     abcdefg
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; comment end by same length ';;'s as start
+
+;; title           jazz-taste-something
+;; midifilename    preModifier.mid
+
+
+
+;; track 1
+
+;; System Exclusive Data
+
+EFF:=(
+   F0,43,10,4C,02,01,00,01,01,F7  ;; room type
+   F0,43,10,4C,02,01,02,40,F7     ;; reverb
+   F0,43,10,4C,02,01,0B,77,F7     ;; dry/wet
+   F0,43,10,4C,02,01,14,70,F7     ;; feed back level
+)
+
+;; blues chord sequence
+BL:=:c7,===:f7,===:c7,=== ====    :f7,=== ====:c6,===:am7,==:aaug,   :dm7,===:g7,===:c6,=:a7,=:dm7,=:gaug,=
+
+;; rythm
+RY:=[{_k!,_o!}/:_c!r_o!//:_o!2_s!//:_c!r_o!/ {_k!,_o!}/:_c!r_o!/_o!/:_c!r_o!/]6
+
+;; base line
+BS:=ccecffcfccefgfec fffcffffcccbaacC dcbagGabccaadd-gg
+
+(xg:on)
+&( $delta(120) $se($EFF[1]) 00 $se($EFF[2]) 00 $se($EFF[3]) 00 $se($EFF[4]))
+(tempo:120)
+(accent:25)
+
+(p:sax)v100 
+     (mark:start) /:rr--'g//:+e'(+)dre/~/:rrr-g/ /:+ererrrr//:eabe+berrr/rr-
+
+|||  (mark:start) r*120 (p:orga)(stroke:4) v65 (g:63) r*10 r8
+|||  (mark:start) r*120 v65 r*24                           r7/:rr_s!/
+|||  (mark:start) r*120 (p:bas)v80 -- (g:73) r*20          r8
+|||  (mark:start) 
+/////////////////////////////////////////////////////////////////
+
+   [
+    (V:  o o 110  50,80,40,110 115  60  90 100,50   110,80 90)
+    (G:  o - o    -  o -o     30     o   o    o-        o-o)
+     r/:ede/~/:~~c/  /:fD^f/~~/:~~D/  r/:F~~^g/~/:~fD/      /:fD~/c~~
+
+||| [$BL]12
+||| [$RY]12
+||| [$BS]12
+///////////////////////////////////////////////////////////////
+   (V: o,80,110      90,  o oo  o  oo,o     110,       o  o    oo    oo 100 o,o    o  )
+   (G: o oo           o   o oo  o  oo o       -,)
+    rf/:ara/~      /:~~A//:~~c^d~A//:a~Ag~^a~//:~^ar/      rg/:~c~//:~Aa/  /:fgD//:~ef/~/:r~~a/
+
+;; track 2 over are omitted by page seperater"///"
+;;;;;;;;;
+ tracks time adjust mark is not yet ...
+;;;;;;;;;
+///////////////////////////////////////////////////////////////
+
+   (V:  o, o,    o,  100,o , o,o,o,    100,90, o             110,  o , o,o,  110,110, )
+   (G:  o  o     o     o o   o o o      o  o,80,               -,  o   o - )
+   (A:  o  o     o     o o   o o o      (bend:200,-5000,-4700,-4700,-400,-200,0,0,10000,-10000)  o, )
+    /:~-dd/~~+/:ar/   A~/:~~a//:gfg/ /:~~e//:~r2+d{e,a,+e}/(mark:p)rr      ~/:-crf/~/0.51:~Df//0.49:g2f2D2cD2cAgf/ + ]12
+
+|||
+|||
+|||
+TR(x):=(mark:p@$x) r*120 /2:ergrre/
+|||(p:trum)+(v:90)(g:70)(mark:p) r*120 /2:ergrre/ $TR(:4,9,10,11,12)
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+ NOTE:
+    currently, delta-time data in raw hex part is not added to the total-time.
+    so mark adjusting etc. must be modified by hand.
+    in this case, in the room effect data '$delta(120)' is used, so a rest data 'r*120' will adjust the time shift (120 ticks).
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+

data/sample/midi-test.mml

@@ -0,0 +1,20 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ 
+ for CI test script.
+ ver. 1.0
+ 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(tempo:200)
+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)
+
+
+//////////////////////////////////////////////////////////////////////
+
+                               (mark:end)/arr/rar/gaa/rr
+|||(pan:<50)(mark:tes)/2:e2ee/ (mark:end)(p:trum)/rbr/rbr/abb/
+|||(pan:>50)                   (mark:end)(g:30)/rre/rer/dee/
+///////////////////////////////////////////////////////////////

data/smml.gemspec

@@ -10,14 +10,14 @@ Gem::Specification.new do |spec|
   spec.email         = ["pianotoieba+smml@gmail.com"]
   spec.summary       = %q{Simple MML to MIDI}
   spec.description   = %q{compile a Music Macro Language file to a Standard MIDI file.}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/tabasano/wavseq"
   spec.license       = "MIT"
 
-  spec.files         = Dir.glob("lib/*")+Dir.glob("lib/smml/*")+["Gemfile","Rakefile","LICENSE.txt","smml.gemspec","README_smml.md"]
+  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.require_paths = ["lib"]
-
+  spec.required_ruby_version = '>= 1.8.7' 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smml
 version: !ruby/object:Gem::Version
-  version: 0.0.1.3
+  version: 0.0.1.5
 platform: ruby
 authors:
 - tabasano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-17 00:00:00.000000000 Z
+date: 2014-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -55,7 +55,9 @@ files:
 - LICENSE.txt
 - smml.gemspec
 - README_smml.md
-homepage: ''
+- sample/midi-preModifier.txt
+- sample/midi-test.mml
+homepage: https://github.com/tabasano/wavseq
 licenses:
 - MIT
 metadata: {}
@@ -67,7 +69,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="