smml 0.1.1 → 0.1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17054e465ae5c0f404fa3670cd8baed2c8084ad0
-  data.tar.gz: 5f256889f73d29076c707924367ba4ead7a51a07
+  metadata.gz: 2f74a9766abd50fb796e9df2a78d248b23005f6e
+  data.tar.gz: 0210dcb9aa9e45746f97c03b33d47da43d28065c
 SHA512:
-  metadata.gz: b6aa7ea713b36761c92e9d931f7414f045a136b601015038f56ff86eda259211e34d83a2fd7a3523f72cfdb78f4b21c686e800acc143c2f08d122821bae8c051
-  data.tar.gz: a7f56ee6a605dd5033dde9404342bed36f5a97ca4b68ba6a108610b1f463dfa3eaf538bbbe7ad6f43275fe91d65c1a88bc6c9109e5b574748b6991f29843b01e
+  metadata.gz: 2758b65b3eed4fc493e623d5e6ccbb0650b4a0ce408d767e29ff7dd47a5427c16cc7870a97bc63aee1eee6a1f8176b30418341eece1db314a7864d38325a2aae
+  data.tar.gz: 92efb48db8b72f629556a4bd6c633d45b8d3beb528150760ace8dad285a7426f76d9ca84a846e08bdfb642c2e3f382da3c40a10afcd63049c318703610740197

data/lib/smml/msm.rb

@@ -5,12 +5,21 @@ require 'optparse'
 
 $debuglevel=0
 
-def hint
-  cmd=File.basename($0)
+def hintminimum
+  cmd="smml"
   puts "Smml v#{Smml::VERSION}"
   puts <<EOF
-usage: #{cmd} -d \"dddd dr3 dddd r4 drdrdrdr dddd dr3\" -o outfile.mid -t bpm
-       #{cmd} -i infile.txt  -o outfile.mid -t bpm
+usage:
+   data to mid
+       #{cmd} -d \"cdef gabc cbag rfed c4\" -o outfile.mid
+   file to mid
+       #{cmd} -i infile.txt  -o outfile.mid
+   show syntax
+       #{cmd} -s
+EOF
+end
+def showsyntax
+  puts <<EOF
 
 syntax: ...( will be changed time after time)
     abcdefg =tone; capital letters are sharps. followed by number as length. 
@@ -101,6 +110,10 @@ syntax: ...( will be changed time after time)
     and other commands are with parentheses.
 EOF
 end
+def hint
+  hintminimum
+  showsyntax
+end
 
 1.round(2) rescue (
 class Float
@@ -118,6 +131,13 @@ class Fixnum
   end
 end
 )
+[].rotate rescue (
+class Array
+  def rotate
+    self.size>0 ? self[1..-1]+self[0..0] : []
+  end
+end
+)
 def multilineTrim l,com
   r=[]
   on=false
@@ -145,9 +165,18 @@ class String
   def setcmark c
     @@cmark=c
   end
+  def setpagesep c
+    @@pagesep=c
+  end
+  def settracksep c
+    @@tracksep=c
+  end
   def cmark
     @@cmark
   end
+  def pagesep
+    @@pagesep
+  end
   def commentoff ofs="",com=@@cmark
     lines=self.split("\n")
     d=multilineTrim(lines,com)
@@ -157,7 +186,7 @@ class String
   def sharp2cmark
     self.gsub!("#"){@@cmark}
   end
-  def tracksep pspl
+  def tracksep pspl=@@pagesep
     tracks={}
     pages=self.split(/#{pspl}+/)
     markc=0
@@ -167,7 +196,7 @@ class String
         tracks.values.each{|v| v << p }
         markc+=1
       else
-        p.split('|||').each_with_index{|t,i|
+        p.split(@@tracksep).each_with_index{|t,i|
           if tracks[i]
             tracks[i] << t
           else
@@ -200,7 +229,7 @@ class Array
 end
 class Notes < Hash
   @@rythmChannel=9
-  @@n={
+  @@notes={
     "c"=>0,
     "C"=>1,
     "d"=>2,
@@ -217,17 +246,17 @@ class Notes < Hash
     "s"=>[3,@@rythmChannel],
     "u"=>[6,@@rythmChannel]
   }
-  @@invert=@@n.invert
+  @@invert=@@notes.invert
   @@octave=12
   def initialize
-    @@n.each{|k,v|self[k]=v}
+    @@notes.each{|k,v|self[k]=v}
   end
-  def self.get last,n=0
+  def self.get last,dist=0
     last=~/(\-*)(\+*)([[:alpha:]])/
     oct=$1.size*(-1)+$2.size
     last=$3
-    lastnote=@@n[last]+oct*@@octave
-    num=lastnote+n.to_i
+    lastnote=@@notes[last]+oct*@@octave
+    num=lastnote+dist.to_i
     octave= num / @@octave
     pre=if octave>0
           "+"*octave
@@ -243,6 +272,25 @@ class ScaleNotes < Array
   def setSampleRate c
     @samplerate=c
   end
+  def modeinit
+    return if defined?(@@mode)
+    s=[:ionian,:dorian,:phrygian,:lydian,:mixolydian,:aeorian,:locrian,:ionian]
+    @@mode={}
+    @@mode[:ionian]=[0,2,4,5,7,9,11]
+    6.times{|i|
+      tmp=@@mode[s[i]].rotate
+      root=tmp[0]
+      tmp=tmp.map{|t|(t-root+12)%12}
+      @@mode[s[i+1]]=tmp
+    }
+  end
+  def keys
+    @@mode.keys
+  end
+  def setmode first,mode=:ionian
+    self<<first
+    @@mode[mode][1..-1].each{|i|self<<Notes.get(first,"+#{i}")}
+  end
   # todo: use sample rate
   def sample
     self[rand(self.size)]
@@ -255,6 +303,7 @@ class ScaleNotes < Array
     end
   end
   def reset
+    modeinit
     initialize
   end
 end
@@ -769,6 +818,9 @@ class MarkTrack
     @diff
   end
 end
+def guitarTuning
+  %W[-e -a d g b +e]
+end
 module MidiHex
   # 設定のため最初に呼ばなければならない
   def self.prepare bpm=120,tbase=480,vel=0x40,oct=:near,vfuzzy=2
@@ -797,8 +849,9 @@ module MidiHex
     @bendrange=2
     @bendCent=1
     @pancenter=64
-    @scalenotes=ScaleNotes.new
-    @prepareSet=[@tbase,@ch,@velocity,@velocityFuzzy,@basekey,@gateRate,@bendrange,@bendCent,@scalenotes]
+    @scalenotes=ScaleNotes.new.reset
+    @gtune=guitarTuning
+    @prepareSet=[@tbase,@ch,@velocity,@velocityFuzzy,@basekey,@gateRate,@bendrange,@bendCent,@scalenotes,@gtune]
     @chmax=15
     @bendrangemax=127
     file="midi-programChange-list.txt"
@@ -808,6 +861,13 @@ module MidiHex
     pfile=File.expand_path(pfile,base) if not File.exist?(pfile)
     self.loadProgramChange(file)
     self.loadPercussionMap(pfile)
+    self.dumpstatus if $DEBUG && $debuglevel>3
+  end
+  def self.dumpstatus
+    self.instance_variables.each{|i|
+      val=self.instance_variable_get(i)
+      p [i, val] if "#{val}".size<100
+    }
   end
   def self.setmidiname name
     @midiname=name
@@ -834,7 +894,7 @@ module MidiHex
     @data
   end
   def self.setdata d
-    @data=d
+    @data=d.size>0 ? d : false
   end
   def self.accent a
     @accentPlus=a.to_i
@@ -863,7 +923,7 @@ module MidiHex
     @bendCent=8192/@bendrange/100.0 if on
   end
   def self.trackPrepare tc=0
-    @tbase,@ch,@velocity,@velocityFuzzy,@basekey,@gateRate,@bendrange,@bendCent,@scalenotes=@prepareSet
+    @tbase,@ch,@velocity,@velocityFuzzy,@basekey,@gateRate,@bendrange,@bendCent,@scalenotes,@gtune=@prepareSet
     @strokespeed=0
     @preGate=[]
     @preVelocity=[]
@@ -1376,19 +1436,19 @@ module MidiHex
     end
     k
   end
-  def self.basekeySet d
+  def self.basekeySet d,num=1
     case d
     when "-"
-      if @basekey<12
+      if @basekey-12*num < 0
         STDERR.puts "octave too low."
       else
-        @basekey-=12
+        @basekey-=12*num
       end
     when "+"
-      if @basekey>0x7f-12
+      if @basekey+12*num > 0x7f
         STDERR.puts "octave too high."
       else
-        @basekey+=12
+        @basekey+=12*num
       end
     else
       @basekey=d
@@ -1417,13 +1477,22 @@ module MidiHex
     @scalenotes.reset
     s=s.split(",")
     first=s.first
-    s.each{|i|
-      note=i
-      note=Notes.get(first,i) if i=~/^[-+]+[[:digit:]]+$/
-      @scalenotes<<note
-    }
+    mode=s[1]
+    if @scalenotes.keys.member?(:"#{mode}")
+      @scalenotes.setmode(first,:"#{mode}")
+    else
+      s.each{|i|
+        note=i
+        note=Notes.get(first,i) if i=~/^[-+]+[[:digit:]]+$/
+        @scalenotes<<note
+      }
+    end
     p @scalenotes if $DEBUG
   end
+  def self.gtuning s
+    @gtune=s.split(",")
+p @gtune
+  end
   def self.preLength v
     @preLength=v.map{|i|
       case i
@@ -1608,7 +1677,7 @@ module MidiHex
     accent=false
     sharp=0
     @h<<[:controlChange,"10,#{@panoftrack}"] if @autopan
-    cmd=rundata.scan(/&\([^)]+\)|\([-+]*[[:digit:]]?\)|:[^\(,]+\([^\)\(]+\),|:[^,]+,|\([^:]*:[^)\(]*\)|_[^!_]+!|_[^_]__[^\?]+\?|v[[:digit:]]+|[<>][[:digit:]]*|\*?[[:digit:]]+\.[[:digit:]]+|\*?[[:digit:]]+|[-+[:alpha:]]|\^|`|'|./)
+    cmd=rundata.scan(/&\([^)]+\)|\([-+]*[[:digit:]]?\)|:[^\(,]+\([^\)\(]+\),|:[^,]+,|\([^:]*:[^)\(]*\)|_[^!_]+!|_[^_]__[^\?]+\?|v[[:digit:]]+|[<>][[:digit:]]*|\*?[[:digit:]]+\.[[:digit:]]+|[-+][[:digit:]]*|\*?[[:digit:]]+|[[:alpha:]]|\^|`|'|./)
     cmd<<" " # dummy
     p "track hex; start making: ",cmd if $DEBUG
     cmd.each{|i|
@@ -1786,6 +1855,8 @@ module MidiHex
         @h<<[:soundOff,$1]
       when /^\(scale:(.*)\)/
         @h<<[:call,:scale,$1]
+      when /^\(gtune:(.*)\)/
+        @h<<[:call,:gtuning,$1]
       when /^\(chordcenter:(.*)\)/
         @h<<[:call,:chordCenter,$1]
       when /^\(stroke:(.*)\)/
@@ -1826,10 +1897,10 @@ module MidiHex
         end
         @bpm=@bpm*rate
         @h<<[:tempo,@bpm]
-      when "-"
-        @h<<[:call,:basekeySet,"-"]
-      when "+"
-        @h<<[:call,:basekeySet,"+"]
+      when /([-+])([[:digit:]]+)?/
+        plus=$1
+        num=$2 ? $2.to_i : 1
+        @h<<[:call,:basekeySet,plus,num]
       when /^\*?[0-9]+/
         # (i.to_i-1).times{@h<<@h[-1]}
       when "`"
@@ -2009,32 +2080,32 @@ def multiplet d,tbase
   else
     total=tbase*rate
   end
-  r=i.scan(/=|\(\?:[^\]]+\)|\(x:[^\]]+\)|\(chord:[^)]+\)|\(C:[^)]+\)|:[^\(,]+\([^\)]+\),|:[^,]+,|[[:digit:]\.]+|_[^!]+!|~|\([-+]*[[:digit:]]?\)|[-+^`'<>]|./)
-  wait=[]
+  r=i.scan(/=|\(\?:[^\]]+\)|\(x:[^\]]+\)|\(chord:[^)]+\)|\(C:[^)]+\)|:[^\(,]+\([^\)]+\),|:[^,]+,|[[:digit:]\.]+|_[^!]+!|~|\([-+]*[[:digit:]]?\)|[-+]+[[:digit:]]*|[\^`'<>]|./)
+  lengths=[]
   notes=[]
   mod=[]
   r.each{|i|
     case i
     # modifier
-    when /^[-+^`',<>]/,/^\([-+]*[[:digit:]]?\)/
+    when /^[-+]+[[:digit:]]*/,/^[\^`',<>]/,/^\([-+]*[[:digit:]]?\)/
       mod<<i
     # note
     when /^\((\?|x|C|chord):[^\)]+\)|^\^?:[^,]+,|^=/
-      wait<<1
+      lengths<<1
       notes<<"#{mod*""}#{i}"
       mod=[]
     # length
     when /^[[:digit:]]+/
-      wait[-1]*=i.to_f
+      lengths[-1]*=i.to_f
     when " "
     else
-      wait<<1
+      lengths<<1
       notes<<"#{mod*""}#{i}"
       mod=[]
     end
   }
-  sum=wait.inject{|s,i|s+i}
-  ls=wait.map{|i|(i*1.0/sum*total).round} # .map{|i|i.round(dep)}
+  sum=lengths.inject{|s,i|s+i}
+  ls=lengths.map{|i|(i*1.0/sum*total).round} # .map{|i|i.round(dep)}
   er=(total-ls.inject{|s,i|s+i}).to_i
   if er>0
     er.times{|i|
@@ -2052,6 +2123,8 @@ def multiplet d,tbase
     result<<notes[i]
     result<<"*#{ls[i]}"
   }
+  # rest of mod
+  result+=mod
   p "multiplet: ",total,ls.inject{|s,i|s+i} if $DEBUG && $debuglevel>1
   result*""
 end
@@ -2148,7 +2221,7 @@ def tie d,tbase
   res=[]
   # if no length word after '~' length is 1
   d.gsub!(/~([^*[:digit:]])?/){$1 ? "~1#{$1}" : $&} while d=~/~[^*[:digit:]]/
-  li=d.scan(/\$\{[^\}]+\}|\$[^ ;\$_*^`'+-]+|\([^)\(]*\)|:[^\(,]+\([^)]+\),|:[^,]+,|_[^!]+!|_[^_]__[^?]+\?|v[[:digit:]]+|[<>][[:digit:]]*|\*?[[:digit:].]+|\([VGABLN]:[^)]+\)|~|./)
+  li=d.scan(/\$\{[^\}]+\}|\$[^ ;\$_*^`'+-]+|\([^)\(]*\)|:[^\(,]+\([^)]+\),|:[^,]+,|_[^!]+!|_[^_]__[^?]+\?|v[[:digit:]]+|[<>\-+][[:digit:]]*|\*?[[:digit:].]+|\([VGABLN]:[^)]+\)|~|./)
   li.each{|i|
     case i
     when /^(\*)?([[:digit:].]+)/
@@ -2334,7 +2407,10 @@ class Smml
   attr_accessor :tracknum, :tbase, :rundatas, :rawdatas, :mx
   attr_accessor :bpm, :velocity, :octave, :vfuzzy, :data, :infile, :outfile, :autopan
   def initialize tbase=480,pagesep='///',expfile=false,cmark=';;'
+    @tracksep='|||'
     String.new.setcmark(cmark)
+    String.new.setpagesep(pagesep)
+    String.new.settracksep(@tracksep)
     @mx=MidiHex
     @rundatas=[]
     @rawdatas=[]
@@ -2351,6 +2427,9 @@ class Smml
     @vfuzzy=2
     @autopan=true
   end
+  def self.syntax
+    hintminimum
+  end
   def pmap
     puts @mx.programList
   end
@@ -2368,9 +2447,9 @@ class Smml
     @mx.setfile(@infile)
     @mx.setmidiname(@outfile) if @outfile
     @mx.setdata(@data) if ! @mx.getdata
-    (hint;exit) if (! @mx.getdata || ! @mx.getmidiname ) && ! test
+    (hintminimum;exit) if (! @mx.getdata || ! @mx.getmidiname ) && ! test
     settest if test
-    @tracks=@mx.getdata.tracksep(@pagesep)
+    @tracks=@mx.getdata.tracksep
     showtracks if $DEBUG && $debuglevel>1
     fuzzy(fz)
   end
@@ -2411,7 +2490,7 @@ class Smml
     }
     p @macro if$DEBUG
     @rawdatas.flatten!
-    open(@expfile,"w"){|f|f.puts @rundatas*"|||"} if @expfile
+    open(@expfile,"w"){|f|f.puts @rundatas*@tracksep} if @expfile
     @tracknum=@rawdatas.size+@rundatas.size
     @tracknum=@tracks.size
   end

data/lib/smml/version.rb

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

metadata

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