smml 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 399ce12531f91fa0f95a418517a7eaf3a9033119
-  data.tar.gz: 075f0f29408e73724c191251ed701b56c1818182
+  metadata.gz: e2a5f8a92f538689c4376fde815e064a7d4887ec
+  data.tar.gz: cb84d1b91997d306b5de5bbdb4033c3a01e0a1ca
 SHA512:
-  metadata.gz: 0d8dfed6fcff8b3364fc72a52988fd389a841e1eb93f0b472a2ad08aa4e00787f26ef05c030afdf9bbfa5c208a7e6cc6e93738055c10c026e08666494b907e37
-  data.tar.gz: af807db0f9b857c2aee7a086fb5e9a16f8ee12738fb4c2ae752b54eb6c0df9135353d44d04fd09d4c54bb24a45e6ecf28719add73df77db387d7fe8be1639a41
+  metadata.gz: d31c883cdba860e6dc39175eccad5d8ce55cfe95c31fba806042473ae9e5dff29bf3506f8b6c762c62d75fba36b6cfa20b56c257700e03b11fe4fe36d711fd95
+  data.tar.gz: 14dff95b8b0cdf6c81eedb3fa284cb16c9e0d9ed7250022b0eb0928e4c626f68849e1c6614c27896197e4a5825ce6856e8806b87adbe4b2f3e66df2d578ad589

data/lib/smml/msm.rb

@@ -7,7 +7,7 @@ $debuglevel=0
 
 # as gem or this file only
 def version
-  if defined?(Smml) && ( Smml.constants.member?("VERSION") || Smml.constants.member?("VERSION") )
+  if defined?(Smml) && ( Smml.constants.member?("VERSION") || Smml.constants.member?(:VERSION) )
     Smml::VERSION 
   else
     File.mtime(__FILE__).strftime("%Y-%m-%d")
@@ -170,14 +170,14 @@ end
 
 #===========================================================
 module MmlReg
-  def self.r key, sort=true
+  def self.r key, sort=true, pre=""
     raise if sort.class==Symbol
     case key
     when Array
       raise if (key-@@keys).size>0
       ks=key
       ks=(@@keys-(@@keys-ks)) if sort
-      ks.map{|i|@@h[i]}*"|"
+      ks.map{|i|"#{pre}#{@@h[i]}"}*"|"
     else
       @@h[key]
     end
@@ -185,13 +185,24 @@ module MmlReg
     puts "Regex part,arg bug",[key-@@keys]
     raise
   end
+  def self.rPlusPre key, pre, sort=true
+    self.r(key,sort,pre)
+  end
   def self.trackr
-    self.r([:hexraw,:sharps,:chord,:word,:sound,:modifier,:velocity,:tempo,:num,:octave,:note,:mod,:note?,:sound?])
+    self.r([:hexraw,:sharp,:chord,:word,:sound,:modifier,:velocity,:tempo,:num,:octave,:note,:mod,:note?,:sound?])
+  end
+  def self.multipletr
+    self.r([:word,:note,:sound,:chord,:num,:sharp,:octave,:mod])
+  end
+  def self.macroDefr
+    self::MacroDef
+  end
+  def self.repeatr
+    self.r([:repStart,:repEnd,:repmark])
   end
   @@h={} # mml regex key hash. order is in @@keys
   @@keys=[
     :comment,
-    :keyword,
     :macrodefAStart,
     :macrodefA,
     :macrodefStart,
@@ -208,13 +219,12 @@ module MmlReg
     :repEnd,
     :word,
     :modifier,
-    :sharps,
+    :sharp,
     :wordStart,
     :word?,
     :chord,
     :velocity,
     :sound,
-    :DCmark,
     :tempo,
     :mod,
     :octave,
@@ -233,12 +243,15 @@ module MmlReg
     :sound?,
     :plusMinus,
     :lineSep,
+    :repmark,
+    :DCmark?,
     :chord?,
   ]
+  @@h[:repmark]="\\.FINE|\\.DS|\\.DC|\\.\\$|\\.toCODA|\\.CODA|\\.SKIP"
   @@h[:comment]="\\( *comment[^\(\)]*\\)"
   @@h[:word]="\\([^\(\):]*:[^\(\)]*\\)"
   @@h[:wordStart]="\\([^\(\):]*:"
-  @@h[:sharps]="\\([+-]*[[:digit:]]*\\)"
+  @@h[:sharp]="\\([+-]*[[:digit:]\\.]*\\)"
   @@h[:word?]="\\([^\(\)]*\\)"
   @@h[:chord]="\\{[^\{\}]+,[^\{\},]+\\}|:[[:alpha:]][[:alnum:]]*,"
   @@h[:velocity]="v[[:digit:]]+"
@@ -248,7 +261,7 @@ module MmlReg
   @@h[:randNote]="\\?"
   @@h[:sound]="_[^!]+!|=|~"
   @@h[:sound?]="[[:alpha:]]"
-  @@h[:DCmark]="\\.\\$|\\.[[:alpha:]]+"
+  @@h[:DCmark?]="\\.[[:alpha:]]+"
   @@h[:tempo]="[><][[:digit:]]*"
   @@h[:mod]="[`'^]"
   @@h[:octave]=   "[+-][[:digit:]]*"
@@ -262,13 +275,12 @@ module MmlReg
   @@h[:num]="[-+*]?[[:digit:]]+\\.[[:digit:]]+|[-+*]?[[:digit:]]+"
   @@h[:hexraw]="&\\([^()]*\\)"
   @@h[:hexrawStart]="&\\("
-  @@h[:keyword]="macro +"
   @@h[:macroA]="\\$\\{[^}]+\\}\\[[^\\]]+\\]|\\$[^}\\$\\{\\(\\)]+\\[[^\\]]+\\]"
   @@h[:macro]="\\$[[:alnum:]]+\\([^)]*\\)|\\$[[:alnum:]]+|\\$\\{[^}]+\\}"
-  @@h[:macrodefAStart]="[[:alnum:]]+\\([,[:alpha:]]+\\):= *\\( *\\z"
-  @@h[:macrodefA]=     "[[:alnum:]]+\\([,[:alpha:]]+\\):= *[^\\n]+"
-  @@h[:macrodefStart]="[[:alnum:]]+:= *\\( *\\z"
-  @@h[:macrodef]=     "[[:alnum:]]+:= *[^\\n]+"
+  @@h[:macrodefAStart]="[[:alnum:]]+\\([,[:alpha:]]+\\):= *\\( *[;\\z]"
+  @@h[:macrodefA]=     "[[:alnum:]]+\\([,[:alpha:]]+\\):= *[^\\(;\\n][^;\\n]*"
+  @@h[:macrodefStart]="[[:alnum:]]+:= *\\( *[;\\z]"
+  @@h[:macrodef]=     "[[:alnum:]]+:= *[^\\(;\\n][^;\\n]+"
   @@h[:blank]="[[:blank:]]+"
   @@h[:valueSep]=","
   @@h[:parenStart]="\\("
@@ -281,7 +293,9 @@ module MmlReg
   @@h[:modifier]="_[^_]__[^\\?]+\\?"
   r=self.r(@@keys)
   RwAll=/#{r}|./
-  MacroDef=self.r([:macrodefAStart,:macrodefStart,:macrodefA,:macrodef])
+  MacroDef=self.rPlusPre([:macrodefAStart,:macrodefStart,:macrodefA,:macrodef],"macro *")+"|"+
+           self.r([:macrodefAStart,:macrodefStart,:macrodefA,:macrodef])
+  RepStrArray=["[","]",".CODA",".DS",".DC",".FINE",".toCODA",".$",".SKIP"]
   ArgIsOne=%w[ bendCent mark p gm gs xg loadf text ]
   def self.event m,rest=[]
     ((@@keys-rest).map{|k|m=~/\A#{@@h[k]}\z/ ? k : nil}-[nil])[0]
@@ -628,7 +642,6 @@ end
 def trackSizeHex d,cmark="#"
   d=d.commentoff("",cmark).split.join
   i=(d.size+8)/2
-#  p [d,i,i.to_s(16)]
   #("00000000"+i.to_s(16))[-8..-1]
   format("%08x",i)+"  # size: #{i}"
 end
@@ -708,8 +721,8 @@ def txt2hex t
   [r*" ",varlenHex(size)]
 end
 def bendHex d
-  c=d.to_i+8192
-  c=[[c,0].max,16383].min
+  c=d.to_i+MidiHex::BendHalf
+  c=[[c,0].max,MidiHex::BendMax].min
   a=c>>7
   b=c & 0b01111111
   r=[a,b,b*0x100+a]
@@ -816,7 +829,7 @@ def worddata word,d
     depth=$3.split(',').map{|i|
       case i
       when "+","-" ; i
-      else         ; i.to_f
+      else         ; i
       end
     }
     [:"#{word}",pos,depth]
@@ -1012,9 +1025,12 @@ def guitarTuning
   %W[-e -a d g b +e]
 end
 module MidiHex
+    BendMax=16383
+    BendHalf=8192
   # 設定のため最初に呼ばなければならない
   def self.prepare bpm=120,tbase=480,vel=0x40,oct=:near,vfuzzy=2,strict=false
     @ready=true
+    @bendHalfMax=BendHalf
     @strictmode=strict
     @autopan= strict ? false : true
     @strokefaster= strict ? 1 : 3
@@ -1033,7 +1049,9 @@ module MidiHex
     @rythmChannel=9
     @notes=Notes.new
     @ch=0
-    @expression=0x7f
+    @expressionRest=0x60
+    @expressionDef=0x7f
+    @expression=@expressionDef
     @velocity=vel
     @velocityOrg=vel
     @velocityFuzzy=vfuzzy
@@ -1046,7 +1064,7 @@ module MidiHex
     @pancenter=64
     @scalenotes=ScaleNotes.new.reset
     @gtune=guitarTuning
-    @prepareSet=[@tbase,@ch,@velocity,@expression,@velocityFuzzy,@basekey,@gateRate,@bendrange,@bendCent,@scalenotes,@gtune]
+    self.setDefault
     @chmax=15
     @bendrangemax=127
     file="midi-programChange-list.txt"
@@ -1058,6 +1076,15 @@ module MidiHex
     self.loadPercussionMap(pfile)
     self.dumpstatus if $DEBUG && $debuglevel>3
   end
+  def self.setDefault
+    @prepareSet=[
+      @tbase,@ch,@velocity,@expression,@velocityFuzzy,@basekey,@gateRate,@bendrange,@bendCent,@scalenotes,@gtune,@expressionRest,@expressionDef
+    ]
+  end
+  def self.getDefault
+      @tbase,@ch,@velocity,@expression,@velocityFuzzy,@basekey,@gateRate,@bendrange,@bendCent,@scalenotes,@gtune,@expressionRest,@expressionDef=
+      @prepareSet
+  end
   def self.dumpstatus
     self.instance_variables.each{|i|
       val=self.instance_variable_get(i)
@@ -1098,6 +1125,7 @@ module MidiHex
     @gateRate=[g,100].min
   end
   def self.bendRange v
+    @lastbend=0
     case v
     when /^\+/
       @bendrange+=$'.to_i
@@ -1115,10 +1143,12 @@ module MidiHex
   end
   def self.bendCent on
     @bendCent=1
-    @bendCent=8192/@bendrange/100.0 if on
+    @bendCent=@bendHalfMax/@bendrange/100.0 if on
+    @lastbend=0
   end
   def self.trackPrepare tc=0
-    @tbase,@ch,@velocity,@expression,@velocityFuzzy,@basekey,@gateRate,@bendrange,@bendCent,@scalenotes,@gtune=@prepareSet
+    self.getDefault
+    @theremin=false
     @strokespeed=0
     @strokeUpDown=1
     @preGate=[]
@@ -1195,6 +1225,20 @@ module MidiHex
     r<<Event.new(:end,start," 8#{ch} #{key} 00 # #{start} sound off only [#{(@nowtime/@tbase).to_i}, #{@nowtime%@tbase}]\n")
     r
   end
+  def self.thereminNote pos,key,velocity,ch,exp=@expressionDef
+    r=[]
+    @expression=exp
+    if @expression
+      r<<self.expre(0,@expression)
+    end
+    start=@waitingtime
+    @waitingtime=0
+    pos-=start
+    depth=(key-@thereminNote)*100
+    r<<self.bend(start,depth.to_s,ch)
+    r<<self.bend(pos,depth.to_s,ch)
+    r
+  end
   def self.oneNote len=@tbase,key=@basekey,velocity=@velocity,ch=@ch,sharp=0
     velocity=@preVelocity.shift if @preVelocity.size>0
     gate=@gateRate
@@ -1203,6 +1247,7 @@ module MidiHex
     velocity=[velocity,0x7f].min
     key+=sharp
     @key=[[key,0x7f].min,0].max
+    return self.thereminNote(len,key,velocity,ch) if @theremin
     key=format("%02x",@key)
     ch=format("%01x",ch)
     vel=format("%02x",velocity)
@@ -1270,7 +1315,8 @@ module MidiHex
     vel+=@accentPlus if accent
     self.oneNote(len,key,vel,@rythmChannel,sharp)
   end
-  def self.notes c,l=false,accent=false,sharp=0
+  def self.notes c,l=false,accent=false,sharp=0,sharpFloat=false
+    @lastnoteName=c
     n=@notes[c]
     if @octmode==:near && n.class != Array
       if @lastnote
@@ -1282,7 +1328,17 @@ module MidiHex
       (@basekey-=12;@lastnote+=12) if n<0
       n=@lastnote
     end
-    self.notekey(n,l,accent,sharp)
+    r=[]
+    if sharpFloat && sharpFloat!=0
+      v=sharpFloat*@bendHalfMax
+      v=sharpFloat*100 if @bendCent>1
+      r<<self.bend(0,v)
+      r<<self.notekey(n,l,accent,sharp)
+      r<<self.bend(0,0)
+    else
+      r<<self.notekey(n,l,accent,sharp)
+    end
+    r
   end
   def self.shiftChord chord, base, limit=6
     octave=12
@@ -1419,12 +1475,19 @@ module MidiHex
     chx=format("%01x",ch)
     @nowtime+=len
     r=[]
-    r<<Event.new(:end,len," 8#{chx} 3C 00 # rest #{len.to_i}(#{len.round(2)})ticks later, off:ch#{ch}, key:3C\n")
+    if @theremin
+      min=@expressionRest
+      r<<Event.new(:comment,"# rest; ")
+      r<<self.expre(0,min)
+      r<<self.expre(len,min)
+    else
+      r<<Event.new(:end,len," 8#{chx} 3C 00 # rest #{len.to_i}(#{len.round(2)})ticks later, off:ch#{ch}, key:3C\n")
+    end
     r
   end
   def self.restHex len=@tbase,ch=@ch
     r=self.rest(len,ch)
-    r[0].data
+    r[0]
   end
   # d : hex data
   def self.metaEvent d,type=1
@@ -1436,7 +1499,7 @@ module MidiHex
     hexd,len=txt2hex(d)
     delta=varlenHex(pos)
     e=self.metaEvent hexd,type
-    "#{delta} #{e} # #{d}\n"
+    Event.new(:raw,"#{delta} #{e} # #{d}\n")
   end
   def self.metaTitle d=@title,pos=0
     return "" if not d
@@ -1461,7 +1524,7 @@ module MidiHex
     delta=varlenHex(pos)
     t=format("%02X",type)
     len=varlenHex(d.split.join.size/2)
-    "#{delta} FF #{t} #{len} #{d} # #{pos} #{comment}\n"
+    Event.new(:raw,"#{delta} FF #{t} #{len} #{d} # #{pos} #{comment}\n")
   end
   def self.tempo bpm, len=0
     @bpmStart=bpm if ! @bpm
@@ -1611,6 +1674,21 @@ module MidiHex
   end
   def self.bend pos,depth,ch=false
     ch=@ch if ! ch
+    depth.to_s=~/([+-]*)/
+    sign=$1
+    plus=false
+    case sign.size
+    when 0..1
+      depth=depth.to_f
+      plus=true if sign=="+"
+    when 2
+      depth=depth[1..-1].to_f
+      plus=true
+    else
+      STDERR.puts "bend: ?"
+    end
+    depth=@lastbend+depth if plus
+    @lastbend=depth
     depth=(depth*@bendCent).to_i
     pos+=@waitingtime
     @waitingtime=0
@@ -1805,9 +1883,41 @@ module MidiHex
       @strokespeed=s.abs
     end
   end
+  def self.setTheremin flag
+    r=[]
+    if flag
+      if not @lastnote
+        @lastnoteName="c"
+        @lastnote=@notes["c"]
+      end
+      @thereminNote=@lastnote+@basekey
+      r<<self.notes(@lastnoteName,0)
+      key=format("%02x",@thereminNote)
+      ch=format("%01x",@ch)
+      vel=format("%02x",@velocity)
+      r<<Event.new(:e,0," 9#{ch} #{key} #{vel} # theremin sound on note #{@thereminNote} velocity #{@velocity}\n")
+      r<<self.bendRange(12*4)
+      self.bendCent(true)
+    else
+      @thereminNote=false
+      self.bendCent(false)
+    end
+    @theremin=flag
+    r
+  end
   def self.setmark m
-    n=@marktrack.getcount(m,@tracknum)
-    m="#{m}@#{n+1}" if n>0
+    m=~/^([^,]+),/
+    count=$'.to_i
+    if $&
+      if count>1
+        m="#{$1}@#{$'.to_i}"
+      else
+        m=$1
+      end
+    else
+      n=@marktrack.getcount(m,@tracknum)
+      m="#{m}@#{n+1}" if n>0
+    end
     @marktrack.set(m,@tracknum,@nowtime)
     Event.new(:mark,m,@tracknum,@nowtime)
   end
@@ -1883,14 +1993,8 @@ module MidiHex
             end
       end
     }
-    rr.map{|i|
-      case i
-      when String
-        i
-      when Event
-        i.data
-      end
-    }
+    # Array of String or Event class instance
+    rr
   end
   def self.makefraze mmldata,tc
     return "" if not mmldata
@@ -1905,6 +2009,7 @@ module MidiHex
     @shiftbase=40
     accent=false
     sharp=0
+    sharpFloat=0
     @h<<[:controlChange,"10,#{@panoftrack}"] if @autopan
     cmd=mmldata.scan(/#{MmlReg.trackr}|./)
     cmd<<" " # dummy
@@ -1930,19 +2035,21 @@ module MidiHex
           end
         end
         wait.each{|m,c|
+          arg=[c,t,accent,sharp]
+          arg2=[c,t,accent,sharp,sharpFloat]
           case m
           when :percussion
-            @h<<[:percussionNote,c,t,accent,sharp]
+            @h<<[:percussionNote,*arg]
           when :rawsound
-            @h<<[:byKey,c,t,accent,sharp]
+            @h<<[:byKey,*arg]
           when :sound
-            @h<<[:notes,c,t,accent,sharp]
+            @h<<[:notes,*arg2]
           when :dummyNote
-            @h<<[:dummyNote,c,t,accent,sharp]
+            @h<<[:dummyNote,*arg]
           when :chord
-            @h<<[:chord,c,t,accent,sharp]
+            @h<<[:chord,*arg]
           when :chordName
-            @h<<[:chordName,c,t,accent,sharp]
+            @h<<[:chordName,*arg]
           when :rest
             @h<<[:rest,t]
           end
@@ -1951,20 +2058,35 @@ module MidiHex
         wait=[]
         accent=false
         sharp=0
+        sharpFloat=0
       end
       case i
-      when /^\(([-+]*)([[:digit:]])?\)/
-        n=$2 ? $2.to_i : 1
-        if $1.size>1
-          n=$1.size
+      when /^\(([-+]*)([[:digit:]\.]+)?\)/
+        s1,s2=$1,$2
+        n=1
+        sharpFloat=0
+        if s2
+          n=s2.to_i
+          if s2=~/\./
+            sharpFloat=s2.to_f-n
+          end
+        end
+        if s1.size>1
+          n=s1.size
         end
-        sh=$1 ? $1[0..0] : "+"
-        sh="#{sh}#{n}".to_i
-        sharp=sh
+        plus=s1 ? s1[0..0] : "+"
+        sharpFloat*=-1 if plus=="-"
+        sharp="#{plus}#{n}".to_i
       when /^\(key:(-?)\+?([[:digit:]]+)\)/
         tr=$2.to_i
         tr*=-1 if $1=="-"
         @h<<[:basekeyPlus,tr]
+      when /^\(theremin:(.*)\)/
+        if $1=~/off/
+          @h<<[:setTheremin,false]
+        else
+          @h<<[:setTheremin,true]
+        end
       when /^\(mark:(.*)\)/
         @h<<[:setmark,$1]
       when /^\(V:(.*)\)/
@@ -2007,7 +2129,7 @@ module MidiHex
           instrument=$4.to_i
         end
         @h<<[:ProgramChange,channel,instrument]
-      when /^\(bend:(([[:digit:]]+),)?([-,.[:digit:]]+)\)|^_b__([^?]+)\?/
+      when /^\(bend:(([[:digit:]]+),)?([-+,.[:digit:]]+)\)|^_b__([^?]+)\?/
         i="(bend:#{$4.gsub('_'){','}})" if $4
         x,pos,b=worddata("bend",i)
         npos=0
@@ -2178,7 +2300,17 @@ module MidiHex
     puts "float rest add times: #{@frestc}" if $DEBUG
     @h=self.eventlist2str(@h)
     p [:number_with_totaltime, Event.new(:dummy).showTotalTime],[:allevent,@eventlist.map{|i|i.display}] if $DEBUG && $debuglevel>2
-    @h*"\n# track: #{@tracknum} ==== \n"
+    @h
+  end
+  def self.eventArray2str data,tc
+    data.map{|i|
+      case i
+      when String
+        i
+      when Event
+        i.data
+      end
+    }*"\n# track: #{tc} ==== \n"
   end
   def self.loadMap file, base=0
     if not File.exist?(file)
@@ -2285,15 +2417,15 @@ module MidiHex
     end
   end
   # substitute mark comment lines with shift delta time and dummy event hex data to adjust to most preceding track.
-  def self.trackMake data
+  def self.trackMake data,tc
     @marksh||=@marktrack.calc
-    data=data.split("\n").map{|i|
+    data=self.eventArray2str(data,tc).split("\n").map{|i|
       i=~/^# marktrack\(([^\)]+)\)/
       if $&
         key=$1
         pos=@marksh[key]
         c="position mark: #{key}, #{pos*1.0/@tbase}"
-        @marksh.keys.member?(key) ? self.dummyEvent(c,pos) : i
+        @marksh.keys.member?(key) ? self.dummyEvent(c,pos).data : i
       else
         i
       end
@@ -2323,7 +2455,8 @@ def multiplet d,tbase
   else
     total=tbase*rate
   end
-  r=i.scan(/=|\(\?:[^\]]+\)|\(x:[^\]]+\)|\(chord:[^)]+\)|\(C:[^)]+\)|:[^\(,]+\([^\)]+\),|:[^,]+,|[[:digit:]\.]+|_[^!]+!|~|\([-+]*[[:digit:]]?\)|[-+]+[[:digit:]]*|[\^`'<>]|\([^\)]*\)|./)
+  regex=MmlReg.multipletr
+  r=i.scan(/#{regex}|./)
   lengths=[]
   notes=[]
   mod=[]
@@ -2406,7 +2539,8 @@ def macroDef data
   tmp=[]
   name=""
   num=1
-  s=data.scan(/macro +[^ ;:=]+ *:= *\( *;|macro +[^ ;:=]+ *:=[^;]+|[^ ;:=]+ *:= *\( *;|[^ ;:=]+ *:=[^;]+| *\) *;|[^;]+|./)
+  rstr=MmlReg.macroDefr
+  s=data.scan(/#{rstr}| *\) *;|[^;]+|./)
   data=s.map{|i|
     case i
     when /^(macro +)? *([^ ;:=]+) *:= *\( *;/
@@ -2442,7 +2576,7 @@ def macroDef data
 end
 def nestsearch d,macro
   a=d.scan(/\[[^\[\]]*\] *[[:digit:]]+/)!=[]
-  r=d.scan(/\/[^\/]+\/|\[|\]|\.FINE|\.DS|\.DC|\.\$|\.toCODA|\.CODA|\.SKIP|\$\{[^ \{\}]+\}|\$[^ ;\$*_^`'+-]+|;|./).map{|i|
+  r=d.scan(/\/[^\/]+\/|#{MmlReg.repeatr}|\$\{[^ \{\}]+\}|\$[^ ;\$*_^`'+-]+|;|./).map{|i|
     case i
     when /^\$\{([^\}]+)\}/
       $1
@@ -2466,7 +2600,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(MmlReg::RwAll)
   li.each{|i|
     case i
     when /^(\*)?([[:digit:].]+)/
@@ -2530,7 +2664,8 @@ def repCalc line,macro,tbase
       r ? r : b
     end
   }*""
-  regex=/\/[^\/]+\/|\[|\]|\.FINE|\.DS|\.DC|\.\$|\.toCODA|\.CODA|\.SKIP|\$\{[^ \{\}]+\}|\$[^ ;\$_*^,\)\(`'\/+-]+|\([^\)]*:|\)|./
+  repmark=MmlReg.repeatr
+  regex=/\/[^\/]+\/|#{repmark}|\$\{[^ \{\}]+\}|\$[^ ;\$_*^,\)\(`'\/+-]+|\([^\)]*:|\)|./
   a=line.scan(regex)
   a=a.map{|i|
     if i=~/^\/[^\/]+\//
@@ -2607,7 +2742,7 @@ def repCalc line,macro,tbase
     end
     res<<current
   end
-  res=(res-["[","]",".CODA",".DS",".DC",".FINE",".toCODA",".$",".SKIP"])*""
+  res=(res-MmlReg::RepStrArray)*""
   res=repCalc(res,macro,tbase) while macro.keys.size>0 && nestsearch(res,macro)
   p res if $DEBUG && $debuglevel>1
   # 空白
@@ -2758,15 +2893,21 @@ class Smml
     @mx.autopan(@autopan)
     tc=0
     # remember starting position check if data exist before sound
-    @htracks << @mx.metaTitle + @mx.generaterText + @mx.starttempo.data + @mx.makefraze(@rundatas[0],tc) + @mx.lastrest
+    @htracks[tc]=[]
+    @htracks[tc]=[@mx.metaTitle, @mx.generaterText, @mx.starttempo, @mx.makefraze(@rundatas[0],tc), @mx.lastrest].flatten
     @rundatas[1..-1].each{|track|
       tc+=1
-      @htracks<< @mx.restHex + @mx.makefraze(track,tc) + @mx.lastrest
+      @htracks[tc]=[]
+      @htracks[tc]=[@mx.restHex,@mx.makefraze(track,tc), @mx.lastrest].flatten
     }
   end
   def pack
     @header=@mx.header(1, @tracknum, @tbase)
-    alla=[@header]+@htracks.map{|t|@mx.trackMake(t)}.flatten
+    tc=0
+    alla=[@header]+@htracks.map{|t|
+      tc+=1
+      @mx.trackMake(t,tc-1)
+    }.flatten
     puts alla if $DEBUG
     all=alla.map{|i|i.commentoff("","#")}*""
     array=[all.split.join]

data/lib/smml/version.rb

@@ -1,3 +1,3 @@
 class Smml
-  VERSION = "0.1.6"
+  VERSION = "0.1.8"
 end

data/sample/midi-preModifier.txt

@@ -72,7 +72,7 @@ BS:=ccecffcfccefgfec fffcffffcccbaacC dcbagGabccaadd-gg
 |||
 |||
 |||
-TR(x):=(mark:p@$x) r*120 /2:ergrre/
+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)
 
 

data/smml.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/tabasano/wavseq"
   spec.license       = "MIT"
 
-  spec.files         = Dir.glob("lib/*")+Dir.glob("lib/smml/*")+Dir.glob("bin/*")+["Gemfile","Rakefile","LICENSE.txt","smml.gemspec","README_smml.md","tutorial_smml.md"]+["sample/midi-preModifier.txt","sample/midi-test.mml"]
+  spec.files         = Dir.glob("lib/*")+Dir.glob("lib/smml/*")+Dir.glob("bin/*")+["Gemfile","Rakefile","LICENSE.txt","smml.gemspec","README_smml.md","tutorial_smml.md"]+["sample/midi-preModifier.txt","sample/midi-test.mml","sample/ssmml.rb"]
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.extra_rdoc_files =%w[README_smml.md LICENSE.txt tutorial_smml.md]

data/tutorial_smml.md

@@ -188,7 +188,9 @@ minus value is for to stroke up. currently, up value affects once only as it sim
 (+)a (-)b (0)c
 ```
 
-strange ways can be affective currently. '(+4)a' etc.
+strange ways of sharp/flat can be affective currently. ```(+4)a``` , ```(-1.2)a``` etc. in float value, bend data is used inside.
+
+
 ;; instead of 'd' etc., note numbers can be used if you want.
 ;; MIDI note value is from 0 to 127. it's over Piano's 88. but too high/low note may not be played and heard.
 
@@ -242,6 +244,21 @@ _snare! = = =
 
 first two tracks are 'organ' sound by the track names declared.
 
+
+currenly track names are not used, and tracks continue with apprearing order. so if there are no data in some tracks in mid parts of pages,
+use blank tracks by track seperaters.
+
+```
+    c     ;; track 1
+||| e     ;; track 2
+||| g     ;; track 3
+///////////////////////////////////////
+    abc   ;; track 1
+|||       ;; track 2 , no data but it can't be omitted to adjust track counters after this track.
+||| def   ;; track 3
+``` 
+
+ 
 ## page
 ;; then seperate pages by three or longer one line '/'.
 ;; but this command do not adjust time potisions. it simply resets track number increment.
@@ -297,6 +314,7 @@ these are played like  this.
 ```
 
 ;; same mark names 'm' in repeated section or one track will be automaticaly substituded by 'm m@2 m@3'. to adjust, use it in other tracks.
+or use a comma , '(mark:hoge@3)' = '(mark:hoge,3)'
 
 ```
   a b c (mark:m) a b c (mark:m@2) a b c (mark:m@3)
@@ -333,36 +351,40 @@ so in this list, instrument number 1,2 and 3 match the keyword 'piano'.
 So '(p:guitar,2)' selects an instrument line '5 two' as the 2nd result of searching 'guitar' and will be used instead of no word 'guitar' on it.
 
 ## hex data
-;; until smml syntax is completed, raw hex parts can be used for complex data and things you don't know how to inprement in data.
-search MIDI format and set hex data.
+;; until smml syntax is completed, or other reasons, raw hex parts can be used for deep level data and things you don't know how to inprement by smml data.
+search MIDI format and set valid hex data.
 
 ```
   &(00 00 00)
 ```
 
+hex data must be ``` 00 01 02 ... FD FE FF ```. one byte is by two hex letters. seperaters are a blank or comma.
 ;; currently hex only can be used. oct/decimal may be able to use someday.
 all in SMF track data, unique formated prefix delta tick time data is needed. so if want, you can use '$delta(240)' for 240 ticks.
 the tick means a minimum time span in SMF , one beat equals to 480 ticks as default. in this case, delta time is set to half beat.
 also '$se(F0 41 ..)' can be used for system exclusive message data.
 currently, nest data of parenthesis is not implemented except very limited cases.
+anyway, when you use hex data, be careful not to set invalid data. smml don't check its MIDI data validation.
+
 
-## macro define
+## define and apply macro variable
 ;; for repeating phrase, macro can be used. use prefix '$' for refering.
 
 ```
-    Macr:=cde
+    VeryLongPhraze:=cde
     macro W:=abc
 
-    ggg $Macr fff $W
+    ggg $VeryLongPhraze fff $W
 ```
 
-the  4th line will be subsituted by
+the  4th line will be replaced by
 
 ```
-    ggg cde fff abc.
+    ggg cde fff abc
 ```
 
-the keyword 'macro' is used just for reading and will simply be ignored.
+the keyword 'macro' is used just for easy readability and will simply be ignored.
+a macro definition is normally within and whole one line. you can write any valid smml data after '```:=```'.
 
 
 ;; macro with args
@@ -385,10 +407,11 @@ will be
    ab10 (wait:4) ab20 (wait:4) ab30
 ```
 
-'(wait:4)' was inserted by '4' in first place before args. it means 4 beats of rest (exact mean of '(wait:..)' is 'do nothing and wait for the next command' ).
+'(wait:4)' was inserted by '4' in first place before args. it means 4 beats of rest (exact mean of '(wait:..)' is
+'do nothing, set it free even if sound is on and wait for the next command' ).
 
 
-multiline macro definition
+multiline macro definition is ;
 
 ```
 EFF:=(
@@ -399,7 +422,8 @@ EFF:=(
 )
 ```
 
-but now, this is for easy way of writing only, and may not be so useful. to use it, each line must be seperated.
+after parenthesis, don't set any letters without blanks.
+but now, this is for easy way of writing only, and may not be so useful. to use this multi line values, each line must be seperated.
 
 ```
 $EFF[1] $EFF[2] $EFF[3] $EFF[4]
@@ -413,11 +437,12 @@ but, these are MIDI system exclusive HEX data, so to make it really effective da
 ```
 
 ```$se()``` translates hex SysEx data to SMF hex data, and it needs pre delta-time data by ```$delta(ticks)``` like other data.
-```$delta(0)``` is ```00``` , so both of these are effective.
+```$delta(0)``` is ```00``` , so both of these are effective. inside ```$delta()``` value is not hex, use decimal number.
 
+'${ff}' can be used for '$ff' as macro variable.
 
 ## comment
-;; ignored after ';;' of each line. write comments there.
+;; words after ';;' of each line are ignored. write comments there.
 multi line comments start with longer ';'.
 end mark is same or longer mark of ';' than start mark. these must start from the top of the line.
 
@@ -618,11 +643,20 @@ so,
 
 ;; set this track's channel 1. when several tracks use same channel, for example it will behave as the same instrument.
 
+
+```
+ (bend:100) c
+```
+
+pitch bend 100 of note 'c'. 
+
 ```
- (bend:100)
+ (bend:+100) c
+ (bend:+-200) c
 ```
 
-pitch bend 100
+'+' relative value. if these are after above, three notes are bend 100 of 'c', bend 200 of 'c' and bend 0 of 'c'.
+
 
 ```
  (bendRange:12)
@@ -693,6 +727,16 @@ now, note type commands are :
 
 ```'~'``` 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,
+
+```
+(p:organ)
+(theremin:on)
+ab /:cde/ f
+```
+
+after on command, data is manipulated as bend data inside smml. not completed about modifiers for this.
+
 
 ## preprocess
 ;; some pre-process commands.
@@ -720,6 +764,7 @@ all after that are real values. the '+' adds 10 to latest value as default.
  so expression data is ;``` 40,50,60,70,80,70,60,50,40,50,60,70,80...``` with each 20 ticks interval.
 bend and expression values inside these parts will be reseted after the modified note ends.
 series of ```(A:..)``` parts are merged. if not, old one is overwtitten.
+'o' is dummy and it set nil value and simply ignored. it is for visibility purpose only.
 
 
 ## text

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smml
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - tabasano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-01 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,7 +44,6 @@ email:
 executables:
 - mmlsmml
 - smml
-- ssmml
 extensions: []
 extra_rdoc_files:
 - README_smml.md
@@ -58,7 +57,6 @@ files:
 - lib/smml/version.rb
 - bin/mmlsmml
 - bin/smml
-- bin/ssmml
 - Gemfile
 - Rakefile
 - LICENSE.txt
@@ -67,6 +65,7 @@ files:
 - tutorial_smml.md
 - sample/midi-preModifier.txt
 - sample/midi-test.mml
+- sample/ssmml.rb
 homepage: https://github.com/tabasano/wavseq
 licenses:
 - MIT