smml 0.1.0.4 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5502e954b9a84c81d1589125b9c6bff866c7a47c
-  data.tar.gz: 7a54373e442e7d92e5200fd699bd99cbddff5118
+  metadata.gz: 17054e465ae5c0f404fa3670cd8baed2c8084ad0
+  data.tar.gz: 5f256889f73d29076c707924367ba4ead7a51a07
 SHA512:
-  metadata.gz: 3724df4add3c3d66ac9cc733149a5762bf8e899d0bf28e673d4d01b066b529d72ed612f77cca459612ea5ee06df9bd2d3669f0668fcc2f3320ac318108624117
-  data.tar.gz: f65ca001292854935dfd31c15d73d5556d7e4fee703026a864d62760c4fea85b5746b44434239caa49964f0e189fee9e484ec0f18ba648431615cb620a4cf514
+  metadata.gz: b6aa7ea713b36761c92e9d931f7414f045a136b601015038f56ff86eda259211e34d83a2fd7a3523f72cfdb78f4b21c686e800acc143c2f08d122821bae8c051
+  data.tar.gz: a7f56ee6a605dd5033dde9404342bed36f5a97ca4b68ba6a108610b1f463dfa3eaf538bbbe7ad6f43275fe91d65c1a88bc6c9109e5b574748b6991f29843b01e

data/lib/smml/msm.rb

@@ -198,6 +198,47 @@ class Array
     r
   end
 end
+class Notes < Hash
+  @@rythmChannel=9
+  @@n={
+    "c"=>0,
+    "C"=>1,
+    "d"=>2,
+    "D"=>3,
+    "e"=>4,
+    "f"=>5,
+    "F"=>6,
+    "g"=>7,
+    "G"=>8,
+    "a"=>9,
+    "A"=>10,
+    "b"=>11,
+    "t"=>[0,@@rythmChannel],
+    "s"=>[3,@@rythmChannel],
+    "u"=>[6,@@rythmChannel]
+  }
+  @@invert=@@n.invert
+  @@octave=12
+  def initialize
+    @@n.each{|k,v|self[k]=v}
+  end
+  def self.get last,n=0
+    last=~/(\-*)(\+*)([[:alpha:]])/
+    oct=$1.size*(-1)+$2.size
+    last=$3
+    lastnote=@@n[last]+oct*@@octave
+    num=lastnote+n.to_i
+    octave= num / @@octave
+    pre=if octave>0
+          "+"*octave
+        elsif octave<0
+          "-"*(octave*-1)
+        else
+          ""
+        end
+    pre+@@invert[num%@@octave]
+  end
+end
 class ScaleNotes < Array
   def setSampleRate c
     @samplerate=c
@@ -213,6 +254,9 @@ class ScaleNotes < Array
       self.sample
     end
   end
+  def reset
+    initialize
+  end
 end
 def unirand n,c,reset=false
   a=[0,n]
@@ -741,23 +785,7 @@ module MidiHex
     @onlist=[]
     @waitingtime=0
     @rythmChannel=9
-    @notes={
-      "c"=>0,
-      "C"=>1,
-      "d"=>2,
-      "D"=>3,
-      "e"=>4,
-      "f"=>5,
-      "F"=>6,
-      "g"=>7,
-      "G"=>8,
-      "a"=>9,
-      "A"=>10,
-      "b"=>11,
-      "t"=>[0,@rythmChannel],
-      "s"=>[3,@rythmChannel],
-      "u"=>[6,@rythmChannel]
-    }
+    @notes=Notes.new
     @ch=0
     @velocity=vel
     @velocityOrg=vel
@@ -1160,7 +1188,7 @@ module MidiHex
   end
   def self.generaterText
     file=__FILE__
-    thisVer=File.mtime(file).strftime("%Y-%m-%d")
+    thisVer="v#{Smml::VERSION}"
     thisVer="" if $debuglevel && $debuglevel>1
     pos=@tbase
     self.metaText("generated by midi-simple-make.rb (#{thisVer})",pos)
@@ -1384,11 +1412,17 @@ module MidiHex
     @chordCenter=[[0,@chordCenter].max,0x7f].min
     @firstchordbase=@chordCenter
   end
+  # todo: use scale name
   def self.scale s
+    @scalenotes.reset
     s=s.split(",")
+    first=s.first
     s.each{|i|
-      @scalenotes<<i
+      note=i
+      note=Notes.get(first,i) if i=~/^[-+]+[[:digit:]]+$/
+      @scalenotes<<note
     }
+    p @scalenotes if $DEBUG
   end
   def self.preLength v
     @preLength=v.map{|i|

data/lib/smml/version.rb

@@ -1,3 +1,3 @@
 class Smml
-  VERSION = "0.1.0.4"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smml
 version: !ruby/object:Gem::Version
-  version: 0.1.0.4
+  version: 0.1.1
 platform: ruby
 authors:
 - tabasano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-23 00:00:00.000000000 Z
+date: 2014-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler