smml 0.1.11 → 0.1.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 922842aff19418ca5f712d524dd4c6260bba7b05
-  data.tar.gz: 88c1dd28f5c1f2ac2b1501dffae83e5a767e40c0
+  metadata.gz: bc386302aaef1ecc9aea9dc8a5a3cf2ae35b6535
+  data.tar.gz: 7c506e05aac70336b2d9c474492ece2993f77523
 SHA512:
-  metadata.gz: cb7ec5dc247cad1eed654dda4fa955bf609dbd393872037812269d5e073fb400f4cc25dd6a20e8f1d50ef098858ceacd0b686a477d35046b5bd001f07eef1c64
-  data.tar.gz: f7791a499278203e5684c6a740ac8ac1b45cdd186954e294be8016eac45f98c2f29aa9763564a26d9c19c59cc21ec772bb02d19180937d4c03e947be05648c37
+  metadata.gz: 393656c916d75e843e40541370272454def0751d134f6526eafddf328b883f868279ce0783de05da6ef5b0991cfca90a7a700a6af870b975c4e822bd6b7a96f2
+  data.tar.gz: f817a17d7f50c215db348642e471765fa9e67fabaff70729b2ca0e463b3abc2f1cf926ff1a754599a31b01f148f776ca6941c03c4db04cc2278d057b97f56798

data/lib/smml/msm.rb

@@ -147,6 +147,103 @@ class Array
   end
 end
 )
+# MyLength.new(1,"2j")
+# num and fixed mark word, for swing rythm
+class MyLength < Numeric
+  def initialize *a
+    p [:in,a,a.size] if $DEBUG
+    a=a[0] if a.size==1
+    r=[]
+    case a
+    when String
+      a=~/\?\?([^\?]*)\?\?/
+      a=$1 if $1
+      r=a.split("+")
+    when Array
+      r=a
+    when MyLength
+      r=a.s,a.j
+    else
+      r=[a]
+    end
+    @s=Float(r[0])
+    @j=([r[1]]-[nil]).flatten||[]
+    p [:i,@s,@j,r,a]  if $DEBUG
+  end
+  def s
+    @s
+  end
+  def j
+    @j
+  end
+  def + (other)
+    p "#{@s} #{other} +!" if $DEBUG
+    o=MyLength.new(other)
+    s=@s+o.s
+    j=@j
+    j=o.j if j.size<1
+    MyLength.new(s,j)
+  end
+  def - (other)
+    p "#{@s} #{other} -!" if $DEBUG
+    o=MyLength.new(other)
+    s=@s-o.s
+    j=@j
+    MyLength.new(s,j)
+  end
+  def * (other)
+    p "#{@s} #{other} *!" if $DEBUG
+    o=MyLength.new(other)
+    s=@s*o.s
+    j=@j
+    j=o.j if j.size<1
+    MyLength.new(s,j)
+  end
+  def / (other)
+    p "#{@s} #{other} /!" if $DEBUG
+    o=MyLength.new(other)
+    s=@s/o.s
+    j=@j
+    MyLength.new(s,j)
+  end
+  def coerce(other)
+    p [:c] if $DEBUG
+    if other.kind_of?(Float)
+      return MyLength.new(other), self
+    elsif other.kind_of?(Fixnum)
+      return MyLength.new(other), self
+    elsif other.kind_of?(String)
+      return self,MyLength.new(other)
+    else
+      super
+    end
+  end
+  def round
+    MyLength.new(@s.round,@j)
+  end
+  def inspect
+    "#{@s}(#{@j})!?"
+  end
+  def to_s int=true
+    j=@j.inject(""){|s,i|s+(i||"")}
+    (int ? @s.to_i.to_s : @s.to_s)+ (j.size>0 ? "_#{j}" : "")
+  end
+  def to_f
+    self.to_s(false)
+  end
+  def to_l
+    @s
+  end
+  def to_i
+    @s.to_i
+  end
+end
+class Numeric
+  def to_myl
+    MyLength.new(self)
+  end
+end
+
 def multilineTrim l,com
   r=[]
   on=false
@@ -185,14 +282,17 @@ module MmlReg
     puts "Regex part,arg bug",[key-@@keys]
     raise
   end
+  def self.rr key, sort=true, pre=""
+    /#{self.r(key,sort,pre)}/
+  end
   def self.rPlusPre key, pre, sort=true
     self.r(key,sort,pre)
   end
   def self.trackr
-    self.r([:hexraw,:sharp,:chord,:word,:sound,:modifier,:velocity,:tempo,:num,:octave,:note2,:note,:mod,:note?,:sound?])
+    self.r([:hexraw,:sharp,:chord,:word,:sound,:tieNote,:register,: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])
+    self.r([:note2,:word,:note,:sound,:tieNote,:register,:chord,:numswing,:num,:sharp,:octave,:mod])
   end
   def self.macroDefr
     self::MacroDef
@@ -203,6 +303,7 @@ module MmlReg
   @@h={} # mml regex key hash. order is in @@keys
   @@keys=[
     :comment,
+    :keyword,
     :macrodefAStart,
     :macrodefA,
     :macrodefStart,
@@ -226,9 +327,12 @@ module MmlReg
     :chord,
     :velocity,
     :sound,
+    :tieNote,
+    :register,
     :tempo,
     :mod,
     :octave,
+    :numswing,
     :num,
     :blank,
     :valueSep,
@@ -261,7 +365,9 @@ module MmlReg
   @@h[:note?]="[BE]"
   @@h[:dummyNote]="o"
   @@h[:randNote]="\\?"
-  @@h[:sound]="_[^!]+!|=|~|w"
+  @@h[:sound]="_[^!]+!|="
+  @@h[:tieNote]="~|w"
+  @@h[:register]="\\\"[[:digit:]]+"
   @@h[:sound?]="[[:alpha:]]"
   @@h[:DCmark?]="\\.[[:alpha:]]+"
   @@h[:tempo]="[><][[:digit:]]*"
@@ -274,14 +380,16 @@ module MmlReg
   @@h[:repEnd]="\\]"
   @@h[:multipletStart]="\\/\\*?[[:digit:]\\.]*:"
   @@h[:multipletmark]="\\/"
-  @@h[:num]="[-+*]?[[:digit:]]+\\.[[:digit:]]+|[-+*]?[[:digit:]]+"
+  @@h[:numswing]="[[:digit:]],"
+  @@h[:num]="[-+*]?[[:digit:]]+_[[:digit:]]+j,|[-+*]?[[:digit:]]+\\.[[:digit:]]+|[-+*]?[[:digit:]]+"
   @@h[:hexraw]="&\\([^()]*\\)"
   @@h[:hexrawStart]="&\\("
+  @@h[:keyword]="macro +"
   @@h[:macroA]="\\$\\{[^}]+\\}\\[[^\\]]+\\]|\\$[^}\\$\\{\\(\\)]+\\[[^\\]]+\\]"
   @@h[:macro]="\\$[[:alnum:]]+\\([^)]*\\)|\\$[[:alnum:]]+|\\$\\{[^}]+\\}"
-  @@h[:macrodefAStart]="[[:alnum:]]+\\([,[:alpha:]]+\\):= *\\( *[;\\z]"
+  @@h[:macrodefAStart]="[[:alnum:]]+\\([,[:alpha:]]+\\):= *\\( *[;]"
   @@h[:macrodefA]=     "[[:alnum:]]+\\([,[:alpha:]]+\\):= *[^\\(;\\n][^;\\n]*"
-  @@h[:macrodefStart]="[[:alnum:]]+:= *\\( *[;\\z]"
+  @@h[:macrodefStart]="[[:alnum:]]+:= *\\( *[;]"
   @@h[:macrodef]=     "[[:alnum:]]+:= *[^\\(;\\n][^;\\n]+"
   @@h[:blank]="[[:blank:]]+"
   @@h[:valueSep]=","
@@ -325,7 +433,7 @@ module MmlReg
     /#{r}|./
   end
   def self.blanks
-    [:comment,:blank,:lineSep]
+    [:comment,:blank,:lineSep,:keyword]
   end
 end
 
@@ -1065,6 +1173,8 @@ module MidiHex
     @gateRate=100
     @nowtime=0
     @onlist=[]
+    @registerHash={}
+    @swingHash={1=>1.2,2=>1.8}
     @waitingtime=0
     @rythmChannel=9
     @notes=Notes.new
@@ -1103,11 +1213,11 @@ module MidiHex
   end
   def self.setDefault
     @prepareSet=[
-      @tbase,@ch,@velocity,@expression,@velocityFuzzy,@basekey,@gateRate,@bendCentOn,@bendrange,@bendCent,@bendNow,@scalenotes,@gtune,@expressionRest,@expressionDef
+      @tbase,@ch,@velocity,@expression,@velocityFuzzy,@basekey,@gateRate,@bendCentOn,@bendrange,@bendCent,@bendNow,@scalenotes,@gtune,@expressionRest,@expressionDef,@registerHash,@swingHash
     ]
   end
   def self.getDefault
-      @tbase,@ch,@velocity,@expression,@velocityFuzzy,@basekey,@gateRate,@bendCentOn,@bendrange,@bendCent,@bendNow,@scalenotes,@gtune,@expressionRest,@expressionDef=
+      @tbase,@ch,@velocity,@expression,@velocityFuzzy,@basekey,@gateRate,@bendCentOn,@bendrange,@bendCent,@bendNow,@scalenotes,@gtune,@expressionRest,@expressionDef,@registerHash,@swingHash=
       @prepareSet
   end
   def self.dumpstatus
@@ -1172,8 +1282,8 @@ module MidiHex
     cent= @bendCentOn ? 100.0 : 1
     @bendCent=@bendHalfMax/@bendrange/cent
   end
-  def self.vibratoMode m
-    @vibratoMode=
+  def self.vibratoType m
+    @vibratoType=
        case m
        when /^expre/
          "expre"
@@ -1208,6 +1318,7 @@ module MidiHex
   # track initialize
   def self.trackPrepare tc=0
     self.getDefault
+    @basekeybend=0
     @theremin=false
     @strokespeed=0
     @strokeUpDown=1
@@ -1217,6 +1328,7 @@ module MidiHex
     @preLength=[]
     @preBefore=[]
     @preAfter=[]
+    @registered=[]
     @tracknum=tc+1
     tc+=1 if tc>=@rythmChannel # ch10 is drum kit channel
     tc=@chmax if tc>@chmax
@@ -1304,7 +1416,8 @@ module MidiHex
     r<<self.bend(pos,depth.to_s,ch)
     r
   end
-  def self.oneNote len=@tbase,key=@basekey,velocity=@velocity,ch=@ch,sharp=0
+  def self.oneNote len=@tbase,key=@basekey,velocity=@velocity,ch=@ch,sharp=0,swing=false
+    len+=len*self.getswing(swing)
     bendStart=@bendNow
     ch=[ch,0x0f].min
     key+=sharp
@@ -1312,6 +1425,10 @@ module MidiHex
     return self.thereminNote(len,key,velocity,ch) if @theremin
     velocity=@preVelocity.shift if @preVelocity.size>0
     gate=@gateRate
+    if @registered.member?(:staccato)
+      @registered-=[:staccato]
+      gate=10
+    end
     velocity-=rand(@velocityFuzzy) if @velocityFuzzy>0
     velocity=[velocity,0x7f].min
     key=format("%02x",@key)
@@ -1354,7 +1471,8 @@ module MidiHex
     end
     r
   end
-  def self.dummyNote key,len,accent=false,sharp=0
+  def self.dummyNote key,len,accent=false,sharp=0,swing=false
+    len+=len*self.getswing(swing)
     vel=@veloecity
     vel+=@accentPlus
     if key=="?"
@@ -1365,12 +1483,12 @@ module MidiHex
     len=@preLength.shift if @preLength.size>0
     self.oneNote(len,key,vel,sharp)
   end
-  def self.byKey key,len,accent=false,sharp=0
+  def self.byKey key,len,accent=false,sharp=0,swing=false
     vel=@velocity
     vel+=@accentPlus
-    self.oneNote(len,key,vel,@ch,sharp)
+    self.oneNote(len,key,vel,@ch,sharp,swing)
   end
-  def self.notekey key,length=false,accent=false,sharp=0
+  def self.notekey key,length=false,accent=false,sharp=0,swing=false
     len,velocity,ch=[@tbase,@velocity,@ch]
     velocity+=@accentPlus if accent
     len=length if length
@@ -1379,12 +1497,12 @@ module MidiHex
       key,ch=key
     end
     key=key+@basekey
-    self.oneNote(len,key,velocity,ch,sharp)
+    self.oneNote(len,key,velocity,ch,sharp,swing)
   end
-  def self.percussionNote key,len=@tbase,accent=false,sharp=0
+  def self.percussionNote key,len=@tbase,accent=false,sharp=0,swing=false
     vel=@velocity
     vel+=@accentPlus if accent
-    self.oneNote(len,key,vel,@rythmChannel,sharp)
+    self.oneNote(len,key,vel,@rythmChannel,sharp,swing)
   end
   def self.noteCalc c,last,base
     n=@notes[c]
@@ -1400,7 +1518,14 @@ module MidiHex
     end
     [n,last,base]
   end
-  def self.notes c,l=false,accent=false,sharp=0,sharpFloat=false
+  def self.float2bend f
+    v=f*@bendHalfMax/@bendrange
+    if @bendCentOn
+      v=f*100 
+    end
+    v
+  end
+  def self.notes c,l=false,accent=false,sharp=0,sharpFloat=false,swing=false
     if sharpFloat && (sharpFloat!=0)
       s=sharp+sharpFloat
       sharp=s.to_i
@@ -1412,16 +1537,15 @@ module MidiHex
     n,@lastnote,@basekey=self.noteCalc(c,@lastnote,@basekey)
     r=[]
     if sharpFloat && sharpFloat!=0
-      v=sharpFloat*@bendHalfMax/@bendrange
-      v=sharpFloat*100 if @bendCentOn
+      v=float2bend(sharpFloat)
       @bendNow=v
       v+=bendStart
       r<<self.bend(0,v) if not @theremin
-      r<<self.notekey(n,l,accent,sharp)
+      r<<self.notekey(n,l,accent,sharp,swing)
       r<<self.bend(0,bendStart) if not @theremin
       @bendNow=bendStart
     else
-      r<<self.notekey(n,l,accent,sharp)
+      r<<self.notekey(n,l,accent,sharp,swing)
 #      r<<self.bend(0,bendStart)# if bends
 #      @bendNow=bendStart
     end
@@ -1433,7 +1557,8 @@ module MidiHex
     chord=chord.orotate(1) while chord[0]<base-limit
     chord
   end
-  def self.chordName c,l=false,accent=false,sharp=0
+  def self.chordName c,l=false,accent=false,sharp=0,swing=false
+    l+=l*self.getswing(swing)
     c=~/(.)([^(]*)(\((.*)\))?/
     root=$1
     type=$2
@@ -1536,7 +1661,8 @@ module MidiHex
     cc=c.map{|i|(i-r)%12}.sort.map{|i|i+r}
     cc
   end
-  def self.chord c,l=false,accent=false,sharp=0
+  def self.chord c,l=false,accent=false,sharp=0,swing=false
+    l+=l*self.getswing(swing)
     r=[]
     sspeed=@strokespeed
     c=c.reverse if @strokeUpDown<0
@@ -1552,7 +1678,7 @@ module MidiHex
       r+=self.soundOff(i,@ch,sharp)
     }
     self.strokeUpDownReset
-    r+=self.rest(rest) if rest>0
+    r+=self.rest(rest,false,@ch) if rest>0
     r
   end
   def self.strokeUpDownReset
@@ -1561,7 +1687,7 @@ module MidiHex
   def self.setExpressionRest v
     @expressionRest=v.to_i
   end
-  def self.rest len=@tbase,ch=@ch
+  def self.rest len,swing=false,ch=@ch
     chx=format("%01x",ch)
     @nowtime+=len
     r=[]
@@ -1576,7 +1702,7 @@ module MidiHex
     r
   end
   def self.restHex len=@tbase,ch=@ch
-    r=self.rest(len,ch)
+    r=self.rest(len,false,ch)
     r[0]
   end
   # d : hex data
@@ -1811,6 +1937,7 @@ module MidiHex
       depth=@lastbend+depth
     end
     @lastbend=depth
+    depth+=@basekeybend
     pos+=@waitingtime
     @waitingtime=0
     @nowtime+=pos
@@ -1866,6 +1993,10 @@ module MidiHex
       @basekey=d
     end
   end
+  def self.basekeyReset
+    self.basekeySet(@basekeyOrg)
+    @basekeybend=0
+  end
   def self.chordCenter c
     case c
     when "reset"
@@ -1966,7 +2097,7 @@ module MidiHex
     }
   end
   def self.revertPre d
-    mode=@vibratoMode
+    mode=@vibratoType
     d.gsub(/_b__([^?]*)\?/){"(bend:#{$1.split("_")*","})"}.
       gsub(/_e__([^?]*)\?/){"(expre:#{$1.split("_")*","})"}.
       gsub(/_p__([^?]*)\?/){"(panpot:#{$1.split("_")*","})"}.
@@ -2085,17 +2216,18 @@ module MidiHex
     r<<self.expre(restl,e)
     r
   end
-  def self.noteExpression arg,t,accent,sharp,sharpFloat
+  def self.noteExpression arg,t,accent,sharp,sharpFloat,swing
     lexpression=@expression
     n,e=arg.split(',')
     r=[]
     r<<self.expre(0,e)
-    r<<self.notes(n,t,accent,sharp,sharpFloat)
+    r<<self.notes(n,t,accent,sharp,sharpFloat,swing)
     r<<self.expre(0,lexpression)
     r
   end
   # transition rate, note, expression
-  def self.tne arg,t,accent,sharp,sharpFloat
+  def self.tne arg,t,accent,sharp,sharpFloat,swing
+    t+=t*self.getswing(swing)
     exp=@expression
     trans,n,e=arg.split(',')
     trans=0.3 if trans.size==0
@@ -2124,6 +2256,20 @@ module MidiHex
     @lastTne[-1]=@basekey
     r
   end
+  def self.register v
+    r=@registerHash[v.to_i]
+    if r
+      @registered<<r.to_sym
+    else
+      STDERR.puts "register: no data"
+    end
+  end
+  def self.setSwing k,v
+    @swingHash[k.to_i]=v.to_f
+  end
+  def self.setRegister k,v
+    @registerHash[k.to_i]=v
+  end
   def self.broken v
     v=~/off/
     @broken= $& ? false : true
@@ -2139,6 +2285,11 @@ module MidiHex
       puts "bad name '#{v}'"
     end
   end
+  def self.key2bend k
+    v=k.class==Float ? @bendCent*(k-k.to_i) : 0
+    v*=100 if @bendCentOn
+    v
+  end
   def self.eventlist2str elist
     @eventlist=[]
     r=@eventlist
@@ -2151,7 +2302,8 @@ module MidiHex
       case cmd
       when :comment
       when :basekeyPlus
-        @basekey+=arg[0]
+        @basekey+=arg[0].to_i
+        @basekeybend+=self.key2bend(arg[0])
       when :raw
         r<<Event.new(:raw,arg[0])
       when :ahead
@@ -2229,9 +2381,92 @@ module MidiHex
     # Array of String or Event class instance
     rr
   end
+  def self.getswing v,hs=@swingHash
+    r=v ? hs[v.to_i] : false
+    if r
+      (r-v.to_i)/v.to_i
+    else
+      0
+    end
+  end
+  def self.tie d,tbase,swingHash
+    res=[]
+    # if no length word after '~' length is 1
+    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 /^\(setSwing:(.*)\)/
+        k,v=$1.split(',')
+        swingHash[k.to_i]=v.to_f
+        res<<[:modifier,i]
+      when /^(\*)?([[:digit:].]+)(_([[:digit:]]+)j,)?/
+        tick=$1? $2.to_f : $2.to_f*tbase
+        tick+=tick*self.getswing($4,swingHash)
+        if res[-1][0]==:tick
+          res[-1][1]+=tick
+        else
+          res<<[:tick,tick]
+        end
+      when "~"
+        res<<[:tick,tbase] if res[-1][0]==:e
+      # add vibrato data
+      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
+        res<<[:e,i]
+      end
+    }
+    line=""
+    frest=0
+    (res.size-1).times{|i|
+      next if res[i][0]!=:modifier
+      next if res[i+1][0]!=:tick
+      # if tick after modifier, it must be by tie mark
+      n=i-1
+      n-=1 while res[n][0]!=:tick
+      res[n][1]+=res[i+1][1]
+      res[i+1][0]=:omit
+    }
+    res.each{|mark,data|
+      case mark
+      when :e , :modifier
+        line<<data
+      when :tick
+        tick=data.to_i
+        frest+=data-tick
+        (tick+=frest;puts "frest:#{frest}" if $DEBUG && $debuglevel>1;frest=0) if frest>1
+        line<<"*#{tick}"
+      when :omit
+        puts "# shift tick data by tie part" if $DEBUG
+      else
+        STDERR.puts "tie?"
+      end
+    }
+    p res,line if $DEBUG && $debuglevel>1
+    line
+  end
   def self.makefraze mmldata,tc
     return "" if not mmldata
     self.trackPrepare(tc)
+    p [:beforeTie,mmldata] if $DEBUG
+    mmldata=self.tie(mmldata,@tbase,@swingHash)
+    p [:afterTie,mmldata] if $DEBUG
     @systemWait=120
     @h=[]
     wait=[]
@@ -2250,8 +2485,9 @@ module MidiHex
     cmd.each{|i|
       if wait.size>0
         t=@tbase
-        i=~/^(\*)?([[:digit:]]+(\.[[:digit:]]+)?)/
+        i=~/^(\*)?([[:digit:]]+(\.[[:digit:]]+)?)(_([[:digit:]]+)j,)?/
         tickmode=$1
+        swing=$5
         t=$2.to_f if $&
         if $&
           if tickmode
@@ -2268,8 +2504,8 @@ module MidiHex
           end
         end
         wait.each{|m,c|
-          arg=[c,t,accent,sharp]
-          arg2=[c,t,accent,sharp,sharpFloat]
+          arg=[c,t,accent,sharp,swing]
+          arg2=[c,t,accent,sharp,sharpFloat,swing]
           case m
           when :percussion
             @h<<[:percussionNote,*arg]
@@ -2288,7 +2524,7 @@ module MidiHex
           when :chordName
             @h<<[:chordName,*arg]
           when :rest
-            @h<<[:rest,t]
+            @h<<[:rest,t,swing]
           end
         }
         lastwait=wait
@@ -2314,10 +2550,21 @@ module MidiHex
         plus=s1 ? s1[0..0] : "+"
         sharpFloat*=-1 if plus=="-"
         sharp="#{plus}#{n}".to_i
-      when /^\(key:(-?)\+?([[:digit:]]+)\)/
-        tr=$2.to_i
+      when /^\(key:(-?)\+?([[:digit:].]+)\)/
+        num=$2
+        tr=num.to_i
+        tr=num.to_f if num=~/\./
         tr*=-1 if $1=="-"
         @h<<[:basekeyPlus,tr]
+      when MmlReg.rr([:register])
+        i=~/[[:digit:]]+/
+        @h<<[:call,:register,$&]
+      when /^\(set":(.*)\)/
+        d=$1.split(",")
+        @h<<[:call,:setRegister,*d]
+      when /^\(setSwing:(.*)\)/
+        d=$1.split(",")
+        @h<<[:call,:setSwing,*d]
       when /^\(broken:(.*)\)/
         @h<<[:call,:broken,$1]
       when /^\(tne:(.*)\)/
@@ -2362,8 +2609,8 @@ module MidiHex
         @h<<[:call,:preBefore,s]
       when /^\(roll:(.*)\)/
         @shiftbase=$1.to_i
-      when /^\(vibratoMode:(.*)\)/
-        @h<<[:call,:vibratoMode,$1]
+      when /^\(vibratoType:(.*)\)/
+        @h<<[:call,:vibratoType,$1]
       when /^\(vibrato:(.*)\)/
         v=$1
         @h<<[:setFloat,:vibratoRate,v]
@@ -2379,7 +2626,7 @@ module MidiHex
         oct=($2.to_i+2)*12
         @h<<[:call,:basekeySet,oct]
       when /^\(key:reset\)/
-        @h<<[:call,:basekeySet,@basekeyOrg]
+        @h<<[:call,:basekeyReset]
       when /^\(p:(([[:digit:]]+),)?(([[:digit:]]+)|([\?[:alnum:]]+)(,([[:digit:]]))?)\)/
         channel=$1 ? $2.to_i : false
         subNo=false
@@ -2726,13 +2973,19 @@ def multiplet d,tbase
   r.each{|i|
     case i
     # modifier
-    when /^[-+]+[[:digit:]]*/,/^[\^`',<>]/,/^\([-+]*[[:digit:]]?\)/
+    when /^[-+]+[[:digit:]]*/,/^[\^`',<>]/,/^\([-+]*[[:digit:]]?\)/,MmlReg.rr([:register])
       mod<<i
     # note
     when /^\((\?|x|C|chord|tne):[^\)]+\)|^\^?:[^,]+,|^=|\([[:alpha:]\\-\\+]+,[^,]*\)/
       lengths<<1
       notes<<"#{mod*""}#{i}"
       mod=[]
+    # length swing
+    when /^([[:digit:]]+),/
+      n=$1.to_i
+      s=n.to_myl
+      s+=MyLength.new(0,"#{n}j,")
+      lengths[-1]*=s
     # length
     when /^[[:digit:]]+/
       lengths[-1]*=i.to_f
@@ -2740,11 +2993,12 @@ def multiplet d,tbase
     when /^\([^\(\):,]*:.*\)/
       mod<<i
     else
-      lengths<<1
+      lengths<<1.to_myl
       notes<<"#{mod*""}#{i}"
       mod=[]
     end
   }
+  p [:multipletle,lengths] if $DEBUG
   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
@@ -2859,72 +3113,7 @@ def nestsearch d,macro
   p "nest? #{a} #{b} #{c} #{chord}",r,macro if $DEBUG
   a||b||c||chord
 end
-def tie d,tbase
-  res=[]
-  # if no length word after '~' length is 1
-  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:].]+)/
-      tick=$1? $2.to_f : $2.to_f*tbase
-      if res[-1][0]==:tick
-        res[-1][1]+=tick
-      else
-        res<<[:tick,tick]
-      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
-      res<<[:e,i]
-    end
-  }
-  line=""
-  frest=0
-  (res.size-1).times{|i|
-    next if res[i][0]!=:modifier
-    next if res[i+1][0]!=:tick
-    # if tick after modifier, it must be by tie mark
-    n=i-1
-    n-=1 while res[n][0]!=:tick
-    res[n][1]+=res[i+1][1]
-    res[i+1][0]=:omit
-  }
-  res.each{|mark,data|
-    case mark
-    when :e , :modifier
-      line<<data
-    when :tick
-      tick=data.to_i
-      frest+=data-tick
-      (tick+=frest;puts "frest:#{frest}" if $DEBUG && $debuglevel>1;frest=0) if frest>1
-      line<<"*#{tick}"
-    when :omit
-      puts "# shift tick data by tie part" if $DEBUG
-    else
-      STDERR.puts "tie?"
-    end
-  }
-  p res,line if $DEBUG && $debuglevel>1
-  line
-end
+
 # repeat block analysis: no relation with MIDI format
 # '(:..)' => '(lastcmd:..)'
 def repCalc line,macro,tbase
@@ -3032,7 +3221,7 @@ def repCalc line,macro,tbase
   p res if $DEBUG && $debuglevel>1
   # 空白
   res=res.split.join 
-  res=tie(res,tbase)
+  res
 end
 def loadCalc d
   if d=~/\(loadf:(.+)(,(.+))?\)/

data/lib/smml/version.rb

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

data/tutorial_smml.md

@@ -782,7 +782,7 @@ now, note type commands are :
 
   and other commands are with parentheses.
 
-```'~'``` seems likely note type, but it is compressed to preceding note as calculated note length. most commands cannot be set inside of ```'c~~~'.```
+```~``` or ```w``` seems likely note type, but it is compressed to preceding note as calculated note length. most commands cannot be set inside of ```'c~~~'.```
 
 ;; theremin like sound,
 
@@ -817,10 +817,11 @@ rest of second 'f' is 30% of one beat instead others are 30% of three beats.
 ;; vibrato
 
 ```
+ (vibratoType:bend)
  f~~ww~~
 ```
 
-note f then vibrato. bend or expression, under construction.
+note f then vibrato. bend, panpot or expression, under construction.
 
 ;; _REPEAT_ variable
 
@@ -835,6 +836,26 @@ as if uncontrolled
  (broken:on) (broken:off) 
 ```
 
+;; swing
+easy way to express fuzzy swing rythm.
+
+```
+ /:a2b1/
+ (setSwing:2,2.4)(setSwing:1,0.6)/:a2,b1,/
+ (setSwing:2,1.8)(setSwing:1,1.2)/:a2,b1,/
+```
+
+just 2:1, first longer, first shorter. broken if setting part is wrong.
+
+;; register of modifiers
+
+```
+ (set":1,staccato) "1e
+```
+
+```"1``` sets modifier number 1 as staccato for note```e```. now there are no other modes. reserved for simple presetting modifier for one note.
+
+
 ## preprocess
 ;; some pre-process commands.
 set it in the top of file.

metadata

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