smml 0.1.9 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85649d364edc63918512902fb5a190e1a9ae3bcc
-  data.tar.gz: 0abe67520e10480fe4dee9fd115b7f33ec1805e9
+  metadata.gz: 922842aff19418ca5f712d524dd4c6260bba7b05
+  data.tar.gz: 88c1dd28f5c1f2ac2b1501dffae83e5a767e40c0
 SHA512:
-  metadata.gz: 8db3bd75b42f437b91c8811f8be7c8beaf7ea057f1a7b04c3bd62c7cebdfcb228561f9deb80b848db00fe625b8336c7dfc4506fde10dd83a6195ec09ed8b794f
-  data.tar.gz: fe2ade57a8a79b77fb085e3a4f7f6cdcc84a5dbb4f6ada084c736af5e66bf5a109acbd2e0e2afc7e6a2197b29c4b5b93ccc09f976a1221eea3b1a09256ca2734
+  metadata.gz: cb7ec5dc247cad1eed654dda4fa955bf609dbd393872037812269d5e073fb400f4cc25dd6a20e8f1d50ef098858ceacd0b686a477d35046b5bd001f07eef1c64
+  data.tar.gz: f7791a499278203e5684c6a740ac8ac1b45cdd186954e294be8016eac45f98c2f29aa9763564a26d9c19c59cc21ec772bb02d19180937d4c03e947be05648c37

data/lib/smml/msm.rb

@@ -189,7 +189,7 @@ module MmlReg
     self.r(key,sort,pre)
   end
   def self.trackr
-    self.r([:hexraw,:sharp,:chord,:word,:sound,:modifier,:velocity,:tempo,:num,:octave,:note,:mod,:note?,:sound?])
+    self.r([:hexraw,:sharp,:chord,:word,:sound,:modifier,:velocity,:tempo,:num,:octave,:note2,:note,:mod,:note?,:sound?])
   end
   def self.multipletr
     self.r([:note2,:word,:note,:sound,:chord,:num,:sharp,:octave,:mod])
@@ -250,8 +250,8 @@ module MmlReg
   ]
   @@h[:repmark]="\\.FINE|\\.DS|\\.DC|\\.\\$|\\.toCODA|\\.CODA|\\.SKIP"
   @@h[:comment]="\\( *comment[^\(\)]*\\)"
-  @@h[:note2]="\\( *tne *:[^\(\)]*\\)"
-  @@h[:word]="\\([^\(\):]*:[^\(\)]*\\)"
+  @@h[:note2]="\\( *tne *:[^\(\)]*\\)|\\( *[[:alpha:]\\-\\+]+,[^,]*\\)"
+  @@h[:word]="\\([^\(\):,]*:[^\(\)]*\\)"
   @@h[:wordStart]="\\([^\(\):]*:"
   @@h[:sharp]="\\([+-]*[[:digit:]\\.]*\\)"
   @@h[:word?]="\\([^\(\)]*\\)"
@@ -261,7 +261,7 @@ module MmlReg
   @@h[:note?]="[BE]"
   @@h[:dummyNote]="o"
   @@h[:randNote]="\\?"
-  @@h[:sound]="_[^!]+!|=|~"
+  @@h[:sound]="_[^!]+!|=|~|w"
   @@h[:sound?]="[[:alpha:]]"
   @@h[:DCmark?]="\\.[[:alpha:]]+"
   @@h[:tempo]="[><][[:digit:]]*"
@@ -612,20 +612,20 @@ def mymerge span,*arg
   r=[]
   arg.each{|ar|
     next if ! ar
-    m,steps,vs=ar
+    m,steps,start,vs=ar
     steps=[steps] if steps.class!=Array
     steps=steps*(vs.size-1) if steps.size==1
-    r<<[0,m,vs[0]]
+    r<<[start,m,vs[0]]
     if vs.size>1
-      stepsum=steps.inject{|s,i|s+i}
+      stepsum=steps.inject{|s,i|s+i}+start
       vsize=vs.size-1
       if stepsum>span
-        rate=span*1.0/stepsum
+        rate=(span-start)*1.0/stepsum
         steps=steps.map{|i|(i*rate).to_i}
       end
       n=1
       r+=vs[1..-1].map{|i|
-        t=steps.shift*n
+        t=steps.shift*n+start
         n+=1
         [t,m,i]
       }
@@ -800,6 +800,9 @@ def apply d,macro
     end
   }*""
 end
+def innerdata pre,a
+  "_#{pre}__#{a*"_"}?"
+end
 def rawHexPart d,macro={}
   li=d.scan(/\$se\([^)]*\)|\$delta\([^)]*\)|\$bend\([^)]*\)|\(bend:[^)]*\)|\(expression:[^)]*\)|\(expre:[^)]*\)|./)
   res=[]
@@ -814,29 +817,42 @@ def rawHexPart d,macro={}
       d=apply($1,macro)
       bendHex(d)
     when /\(bend:([^)]*)\)/
-      "_b__#{$1.split(',')*"_"}?"
+      innerdata("b",$1.split(','))
     when /\(expre(ssion)?:([^)]*)\)/
-      "_e__#{$2.split(',')*"_"}?"
+      innerdata("e",$1.split(','))
     else
       i
     end
   }*""
 end
-def revertPre d
-  d.gsub(/_b__([^?]*)\?/){"(bend:#{$1.split("_")*","})"}.
-    gsub(/_e__([^?]*)\?/){"(expre:#{$1.split("_")*","})"}
-end
 def worddata word,d
-  d=~/\(#{word}:(([[:digit:].]+),)?([-+,.[:digit:]]+)\)/
+  d=~/\(#{word}:(([[:digit:].]+),)?([-+,.[:alnum:]]+|[[:alpha:]]+)\)/
   if $&
+    start=0
+    vp,vm=0,0
+    case word
+    when "bend"
+      vi=self.bendVibrato
+      vp,vm="+#{vi}","+-#{vi}"
+    when "expre"
+      vi=self.expreVibrato
+      vp,vm="+-#{vi}","+#{vi}"
+    when "panpot"
+      vi=self.panpotVibrato
+      vp,vm="+-#{vi}","+#{vi}"
+    end
     pos=$1 ? $2.to_i : 0
     depth=$3.split(',').map{|i|
       case i
       when "+","-" ; i
+      when /\Astart([[:digit:].]+)\z/
+        start=$1.to_i
+        false
+      when "vibrato" ; [vp,vm,vp,vm]
       else         ; i
       end
-    }
-    [:"#{word}",pos,depth]
+    }.flatten-[false]
+    [:"#{word}",pos,start,depth]
   else
     false
   end
@@ -1146,6 +1162,7 @@ module MidiHex
     @bendrange=[[@bendrange,@bendrangemax].min,0].max
     self.bendCentReset
     r=[]
+    r<<Event.new(:comment,"# bendRange #{@bendrange}")
     r<<self.controlChange("101,0")
     r<<self.controlChange("100,0")
     r<<self.controlChange("6,#{@bendrange}")
@@ -1155,6 +1172,34 @@ module MidiHex
     cent= @bendCentOn ? 100.0 : 1
     @bendCent=@bendHalfMax/@bendrange/cent
   end
+  def self.vibratoMode m
+    @vibratoMode=
+       case m
+       when /^expre/
+         "expre"
+       when /^bend/
+         "bend"
+       when /^pan/
+         "panpot"
+       else
+         "bend"
+       end
+  end
+  def self.bendVibrato
+    @vibratoRate||=0.4
+    v=@vibratoRate*@bendCent
+    v.to_i
+  end
+  def self.expreVibrato
+    @vibratoRate||=0.1
+    v=@vibratoRate*@expression
+    v.to_i
+  end
+  def self.panpotVibrato
+    @vibratoRate||=0.5
+    v=@vibratoRate*0x7f
+    v.to_i
+  end
   def self.bendCent on
     @bendCentOn=on
     self.bendCentReset
@@ -1245,6 +1290,7 @@ module MidiHex
   end
   def self.thereminNote pos,key,velocity,ch,exp=@expression
     r=[]
+    r<<Event.new(:comment,"# use theremin")
     @expression=exp
     if @expression
       r<<self.expre(0,@expression)
@@ -1283,12 +1329,15 @@ module MidiHex
     if b
       bends=worddata("bend",b)
       expre=worddata("expre",b)
-      mymerge(slen,bends,expre).each{|t,m,d|
+      panpot=worddata("panpot",b)
+      mymerge(slen,bends,expre,panpot).each{|t,m,d|
         case m
         when :bend
           r<<self.bend(t,d)
         when :expre
           r<<self.expre(t,d)
+        when :panpot
+          r<<self.panpot(d,t)
         when :rest
           slen=t
         end
@@ -1359,6 +1408,7 @@ module MidiHex
     end
     bendStart=@bendNow
     @lastnoteName=c
+    @basekey=@basekeyCenter+12*(rand(5)-2) if @broken
     n,@lastnote,@basekey=self.noteCalc(c,@lastnote,@basekey)
     r=[]
     if sharpFloat && sharpFloat!=0
@@ -1508,6 +1558,9 @@ module MidiHex
   def self.strokeUpDownReset
     @strokeUpDown=1
   end
+  def self.setExpressionRest v
+    @expressionRest=v.to_i
+  end
   def self.rest len=@tbase,ch=@ch
     chx=format("%01x",ch)
     @nowtime+=len
@@ -1590,13 +1643,40 @@ module MidiHex
     @nowtime+=t
     Event.new(:e,t," B#{ch} #{n} #{data}\n")
   end
+  def self.panpot v,pos=0
+    @pan||=@panoftrack
+    @pan=self.valueplus(@pan,v)
+    self.controlChange("10,#{@pan},#{pos}")
+  end
+  def self.valueplus org,d
+    d=d.to_s
+    d=~/([+-]*)/
+    sign=$1
+    plus=false
+    case sign
+    when /^\+/
+      d=d[1..-1].to_i
+      plus=true
+    when /^-/,""
+      d=d.to_i
+    else
+      STDERR.puts "plus: ?"
+    end
+    if plus
+      org+=d
+    else
+      org=d
+    end
+    org
+  end
   def self.expre len,d
     c=@expression
     explus=10
     case d
     when "+" ; c+=explus
     when "-" ; c-=explus
-    else     ; c=d.to_i
+    else
+      c=self.valueplus(c,d)
     end
     c=midiVround(c)
     @expression=c
@@ -1711,6 +1791,7 @@ module MidiHex
     @programList.map{|i,v|"#{i} #{v}"}
   end
   def self.bend pos,depth,ch=false
+    @lastbend||=0
     ch=@ch if ! ch
     depth.to_s=~/([+-]*)/
     sign=$1
@@ -1725,9 +1806,11 @@ module MidiHex
     else
       STDERR.puts "bend: ?"
     end
-    depth=@lastbend+depth if plus
-    @lastbend=depth
     depth=(depth*@bendCent).to_i if @bendCentOn
+    if plus
+      depth=@lastbend+depth
+    end
+    @lastbend=depth
     pos+=@waitingtime
     @waitingtime=0
     @nowtime+=pos
@@ -1882,6 +1965,13 @@ module MidiHex
       end
     }
   end
+  def self.revertPre d
+    mode=@vibratoMode
+    d.gsub(/_b__([^?]*)\?/){"(bend:#{$1.split("_")*","})"}.
+      gsub(/_e__([^?]*)\?/){"(expre:#{$1.split("_")*","})"}.
+      gsub(/_p__([^?]*)\?/){"(panpot:#{$1.split("_")*","})"}.
+      gsub(/_m__([^?]*)\?/){"(#{mode}:#{$1.split("_")*","})"}
+  end
   def self.preAfter v
     @preAfter=v.map{|i|
       case i
@@ -1995,12 +2085,25 @@ module MidiHex
     r<<self.expre(restl,e)
     r
   end
+  def self.noteExpression arg,t,accent,sharp,sharpFloat
+    lexpression=@expression
+    n,e=arg.split(',')
+    r=[]
+    r<<self.expre(0,e)
+    r<<self.notes(n,t,accent,sharp,sharpFloat)
+    r<<self.expre(0,lexpression)
+    r
+  end
   # transition rate, note, expression
   def self.tne arg,t,accent,sharp,sharpFloat
     exp=@expression
     trans,n,e=arg.split(',')
+    trans=0.3 if trans.size==0
     trans=trans.to_f
-    trans=0.3 if trans==0
+    if trans>1
+      STDERR.puts "(tne) transition rate must be between 0 and 1."
+      trans=1.0
+    end
     bchange=0
     @nowTne=[n,e,sharp,sharpFloat,@basekey]
     if @lastTne
@@ -2021,6 +2124,21 @@ module MidiHex
     @lastTne[-1]=@basekey
     r
   end
+  def self.broken v
+    v=~/off/
+    @broken= $& ? false : true
+    @basekeyCenter=@basekey
+  end
+  def self.dumpVar v
+    v=~/\A[[:alnum:]]+\z/
+    if $&
+      puts "@#{v} #{eval("@#{v}")}"
+    elsif v=="?"
+      puts self.instance_variables.map{|i|i.to_s[1..-1]}.sort
+    else
+      puts "bad name '#{v}'"
+    end
+  end
   def self.eventlist2str elist
     @eventlist=[]
     r=@eventlist
@@ -2028,7 +2146,7 @@ module MidiHex
     elist.each{|h|
       cmd,*arg=h
       e=Event.new(:comment,"# #{cmd} #{arg}")
-      r<<Event.new(:raw,self.metaText("#{cmd} #{arg}")) if $DEBUG && $debuglevel>5
+      r<<Event.new(:raw,self.metaText("#{cmd} #{arg}").data) if $debuglevel>5
       r<<e
       case cmd
       when :comment
@@ -2046,6 +2164,20 @@ module MidiHex
         @ch=arg[0]
       when :waitingtime
         @waitingtime+=arg[0]
+      when :setInt
+        name,v=arg
+        if name.to_s=~/\A[[:alnum:]]+\z/
+          eval("@#{name}=#{v.to_i}")
+        else
+          STDERR.puts "setInt: bad name '#{name}'"
+        end
+      when :setFloat
+        name,v=arg
+        if name.to_s=~/\A[[:alnum:]]+\z/
+          eval("@#{name}=#{v.to_f}")
+        else
+          STDERR.puts "setFloat: bad name '#{name}'"
+        end
       when :call
         cmd,*arg=arg
         method(cmd).call(*arg)
@@ -2111,7 +2243,7 @@ module MidiHex
     accent=false
     sharp=0
     sharpFloat=0
-    @h<<[:controlChange,"10,#{@panoftrack}"] if @autopan
+    @h<<[:panpot,@panoftrack] if @autopan
     cmd=mmldata.scan(/#{MmlReg.trackr}|./)
     cmd<<" " # dummy
     p "track hex; start making: ",cmd if $DEBUG
@@ -2143,6 +2275,8 @@ module MidiHex
             @h<<[:percussionNote,*arg]
           when :rawsound
             @h<<[:byKey,*arg]
+          when :noteExpression
+            @h<<[:noteExpression,*arg2]
           when :tne
             @h<<[:tne,*arg2]
           when :sound
@@ -2184,10 +2318,17 @@ module MidiHex
         tr=$2.to_i
         tr*=-1 if $1=="-"
         @h<<[:basekeyPlus,tr]
+      when /^\(broken:(.*)\)/
+        @h<<[:call,:broken,$1]
       when /^\(tne:(.*)\)/
         wait<<[:tne,$1]
+      when /^\(([[:alpha:]\-\+]+),([^,]*)\)/
+        v="#{$1},#{$2}"
+        wait<<[:noteExpression,v]
       when /^\(lg:(.*)\)/
         @h<<[:call,:setlenforgate,$1]
+      when /^\(expressionRest:(.*)\)/
+        @h<<[:call,:setExpressionRest,$1]
       when /^\(theremin:(.*)\)/
         if $1=~/off/
           @h<<[:setTheremin,false]
@@ -2221,6 +2362,19 @@ module MidiHex
         @h<<[:call,:preBefore,s]
       when /^\(roll:(.*)\)/
         @shiftbase=$1.to_i
+      when /^\(vibratoMode:(.*)\)/
+        @h<<[:call,:vibratoMode,$1]
+      when /^\(vibrato:(.*)\)/
+        v=$1
+        @h<<[:setFloat,:vibratoRate,v]
+      when /^\(setFloat:(.*)\)/
+        name,v=$1.split(",")
+        @h<<[:setFloat,name,v]
+      when /^\(setInt:(.*)\)/
+        name,v=$1.split(",")
+        @h<<[:setInt,name,v]
+      when /^\(dumpVar:(.*)\)/
+        @h<<[:call,:dumpVar,$1]
       when /^\(oct(ave)?:(.*)\)/
         oct=($2.to_i+2)*12
         @h<<[:call,:basekeySet,oct]
@@ -2238,8 +2392,8 @@ module MidiHex
         @h<<[:ProgramChange,channel,instrument]
       when /^\(bend:(([[:digit:]]+),)?([-+,.[:digit:]]+)\)|^_b__([^?]+)\?/
         i="(bend:#{$4.gsub('_'){','}})" if $4
-        x,pos,b=worddata("bend",i)
-        npos=0
+        x,pos,start,b=worddata("bend",i)
+        npos=start
         b.each{|depth|
           @h<<[:bend,npos,depth]
           npos=pos
@@ -2301,12 +2455,12 @@ module MidiHex
         pan=$2.to_i
         case $1
         when ">"
-          pan+=64
+          pan=64+pan
         when "<"
-          pan-=64
+          pan=64-pan
         else
         end
-        @h<<[:controlChange,"10,#{pan}"]
+        @h<<[:panpot,pan]
       when /^\(wait:(\*)?(.*)\)/
         @h<<[:waitingtime,$1? $2.to_i : $2.to_f*@tbase]
       when /^\(accent:([^)]*)\)/
@@ -2575,7 +2729,7 @@ def multiplet d,tbase
     when /^[-+]+[[:digit:]]*/,/^[\^`',<>]/,/^\([-+]*[[:digit:]]?\)/
       mod<<i
     # note
-    when /^\((\?|x|C|chord|tne):[^\)]+\)|^\^?:[^,]+,|^=/
+    when /^\((\?|x|C|chord|tne):[^\)]+\)|^\^?:[^,]+,|^=|\([[:alpha:]\\-\\+]+,[^,]*\)/
       lengths<<1
       notes<<"#{mod*""}#{i}"
       mod=[]
@@ -2583,7 +2737,7 @@ def multiplet d,tbase
     when /^[[:digit:]]+/
       lengths[-1]*=i.to_f
     when " "
-    when /^\([^\)]*\)/
+    when /^\([^\(\):,]*:.*\)/
       mod<<i
     else
       lengths<<1
@@ -2708,8 +2862,16 @@ end
 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(MmlReg::RwAll)
+  li=[]
+  li0=d.scan(MmlReg::RwAll)
+  li0.size.times{|i|
+    li<<li0[i]
+    case li0[i]
+    when "~","w"
+      li<<"1" if li0[i+1] !~ /^(\*)?[[:digit:]]/
+    else
+    end
+  }
   li.each{|i|
     case i
     when /^(\*)?([[:digit:].]+)/
@@ -2721,6 +2883,13 @@ def tie d,tbase
       end
     when "~"
       res<<[:tick,tbase] if res[-1][0]==:e
+    when "w"
+      lasttick=0
+      lasttick=res[-1][1] if res[-1][0]==:tick
+      res<<[:tick,tbase] if res[-1][0]==:e
+      m="m"
+      d=innerdata(m,["100_start#{lasttick}_vibrato"])
+      res.insert(-3,[:modifier,"(A:#{d})"])
     when /^\([VGABLN]:[^)]+/
       res<<[:modifier,i]
     else
@@ -2760,7 +2929,14 @@ end
 # '(:..)' => '(lastcmd:..)'
 def repCalc line,macro,tbase
   rpt=/\[([^\[\]]*)\] *([[:digit:]]+)/
-  line.gsub!(rpt){$1*$2.to_i} while line=~rpt
+  line.gsub!(rpt){
+    data,rep=$1,$2.to_i
+    r=""
+    rep.times{|i|
+      r<<data.gsub(/_REPEAT_([-\*\+[:digit:]]*)/){eval("#{i+1}#{$1}")}
+    }
+    r
+  } while line=~rpt
   chord=/([^$]|^)\{([^\{\}]*)\}/
   line.gsub!(chord){"#{$1}(C:#{$2})"} while line=~chord
   line=line.scan(/(\.\$)|(\$([[:alnum:]]+)\(([^\)]+)\))|(.)/).map{|a,b,bname,barg,c|

data/lib/smml/version.rb

@@ -1,3 +1,3 @@
 class Smml
-  VERSION = "0.1.9"
+  VERSION = "0.1.11"
 end

data/tutorial_smml.md

@@ -814,6 +814,27 @@ f~~(lg:1.0)f~~f~~
 
 rest of second 'f' is 30% of one beat instead others are 30% of three beats.
 
+;; vibrato
+
+```
+ f~~ww~~
+```
+
+note f then vibrato. bend or expression, under construction.
+
+;; _REPEAT_ variable
+
+```
+ [ a _REPEAT_ ] 3  ;; =>  a1 a2 a3
+```
+
+;; broken mode
+as if uncontrolled
+
+```
+ (broken:on) (broken:off) 
+```
+
 ## preprocess
 ;; some pre-process commands.
 set it in the top of file.
@@ -852,3 +873,14 @@ text implement to MIDI file.
 
 but now blanks are removed. someday maybe fixed ?
 
+
+## test, debug etc.
+
+```
+  (setInt: varName,10)
+  (setFloat: varName,10.1)
+  (dumpVar: varName)
+```
+
+directly set local MidiHex variable, dump while compiling if the varName and value are valid.
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smml
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.11
 platform: ruby
 authors:
 - tabasano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-09 00:00:00.000000000 Z
+date: 2014-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler