smml 0.1.2.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f74a9766abd50fb796e9df2a78d248b23005f6e
-  data.tar.gz: 0210dcb9aa9e45746f97c03b33d47da43d28065c
+  metadata.gz: a729ae19582944c975ae13ebf91da26892d6a45d
+  data.tar.gz: c0c49b883cd80909160385613ec563c86d181c74
 SHA512:
-  metadata.gz: 2758b65b3eed4fc493e623d5e6ccbb0650b4a0ce408d767e29ff7dd47a5427c16cc7870a97bc63aee1eee6a1f8176b30418341eece1db314a7864d38325a2aae
-  data.tar.gz: 92efb48db8b72f629556a4bd6c633d45b8d3beb528150760ace8dad285a7426f76d9ca84a846e08bdfb642c2e3f382da3c40a10afcd63049c318703610740197
+  metadata.gz: b3a68fe184996d7995a6dd5146efdca24237e62061f432713b7ed3a602df484d662a1b37bac4dd7421b485554f9c50a7fb5b7eca0d75a07f8b35d6d32bd2b871
+  data.tar.gz: 9519e4fa0758a35d23ffc80a1f556b80989ad04e9b504e5dbd797dab1cbe094c4c0afd49fc24471054c9d48d72d7afe1883f088a8f1c626d7816f115ee0f6dd3

data/bin/smml

@@ -15,6 +15,7 @@ outfile=false
 expfile=false
 vfuzzy=2
 autopan=true
+strictmode=false
 velocity=0x40
 $debuglevel=1
 data=""
@@ -45,8 +46,7 @@ opt.on('-p pspl',"page split chars") {|v| pspl=v }
 opt.on('-F i',"fuzzy shift mode") {|v| $fuzzy=v.to_i }
 opt.on('-v i',"velocity fuzzy value [default 2]") {|v| vfuzzy=v.to_i }
 opt.on('-V',"dont use all fuzzy or auto feature") {|v|
-  vfuzzy=0
-  autopan=false
+  strictmode=true
 }
 opt.on('-O',"octave legacy mode") {|v| octaveMode=:far }
 opt.on('-I',"ignore roland check sum") {|v| $ignoreChecksum=v }
@@ -62,7 +62,11 @@ m.data=data
 m.velocity=velocity
 m.bpm=bpm
 m.octave=octaveMode
-m.vfuzzy=vfuzzy
-m.autopan=autopan
+if strictmode
+  m.strict if strictmode
+else
+  m.vfuzzy=vfuzzy
+  m.autopan=autopan
+end
 m.make($test,$fuzzy)
 m.save if not $testonly

data/lib/smml/msm.rb

@@ -823,9 +823,11 @@ def guitarTuning
 end
 module MidiHex
   # 設定のため最初に呼ばなければならない
-  def self.prepare bpm=120,tbase=480,vel=0x40,oct=:near,vfuzzy=2
+  def self.prepare bpm=120,tbase=480,vel=0x40,oct=:near,vfuzzy=2,strict=false
     @ready=true
-    @autopan=true
+    @strictmode=strict
+    @autopan= strict ? false : true
+    @strokefaster= strict ? 1 : 3
     @startBpm=bpm
     @midiname=false
     @cmark="#"
@@ -925,6 +927,7 @@ module MidiHex
   def self.trackPrepare tc=0
     @tbase,@ch,@velocity,@velocityFuzzy,@basekey,@gateRate,@bendrange,@bendCent,@scalenotes,@gtune=@prepareSet
     @strokespeed=0
+    @strokeUpDown=1
     @preGate=[]
     @preVelocity=[]
     @preNote=[]
@@ -1198,9 +1201,9 @@ module MidiHex
   def self.chord c,l=false,accent=false,sharp=0
     r=[]
     sspeed=@strokespeed
-    (c=c.reverse;sspeed=-sspeed) if sspeed<0
+    c=c.reverse if @strokeUpDown<0
     span=c.size
-    sspeed=l/span if span*sspeed>l
+    sspeed=l/span/@strokefaster if span*sspeed>l/@strokefaster
     c.each{|i|
       r+=self.soundOn(i,@velocity,@ch,sharp)
       @waitingtime+=sspeed
@@ -1210,9 +1213,13 @@ module MidiHex
     c.each{|i|
       r+=self.soundOff(i,@ch,sharp)
     }
+    self.strokeUpDownReset
     r+=self.rest(rest) if rest>0
     r
   end
+  def self.strokeUpDownReset
+    @strokeUpDown=1
+  end
   def self.rest len=@tbase,ch=@ch
     chx=format("%01x",ch)
     @nowtime+=len
@@ -1491,7 +1498,6 @@ module MidiHex
   end
   def self.gtuning s
     @gtune=s.split(",")
-p @gtune
   end
   def self.preLength v
     @preLength=v.map{|i|
@@ -1575,8 +1581,16 @@ p @gtune
     end
   end
   def self.strokeSpeed s
-    s=s.to_i
-    @strokespeed=s
+    case s
+    when "-"
+      @strokeUpDown=-1
+    when "+"
+      @strokeUpDown=1
+    else
+      s=s.to_i
+      @strokeUpDown= s<0 ? -1 : 1
+      @strokespeed=s.abs
+    end
   end
   def self.setmark m
     n=@marktrack.getcount(m,@tracknum)
@@ -1897,7 +1911,7 @@ p @gtune
         end
         @bpm=@bpm*rate
         @h<<[:tempo,@bpm]
-      when /([-+])([[:digit:]]+)?/
+      when /^([-+])([[:digit:]]+)?/
         plus=$1
         num=$2 ? $2.to_i : 1
         @h<<[:call,:basekeySet,plus,num]
@@ -2080,7 +2094,7 @@ def multiplet d,tbase
   else
     total=tbase*rate
   end
-  r=i.scan(/=|\(\?:[^\]]+\)|\(x:[^\]]+\)|\(chord:[^)]+\)|\(C:[^)]+\)|:[^\(,]+\([^\)]+\),|:[^,]+,|[[:digit:]\.]+|_[^!]+!|~|\([-+]*[[:digit:]]?\)|[-+]+[[:digit:]]*|[\^`'<>]|./)
+  r=i.scan(/=|\(\?:[^\]]+\)|\(x:[^\]]+\)|\(chord:[^)]+\)|\(C:[^)]+\)|:[^\(,]+\([^\)]+\),|:[^,]+,|[[:digit:]\.]+|_[^!]+!|~|\([-+]*[[:digit:]]?\)|[-+]+[[:digit:]]*|[\^`'<>]|\([^\)]*\)|./)
   lengths=[]
   notes=[]
   mod=[]
@@ -2098,6 +2112,8 @@ def multiplet d,tbase
     when /^[[:digit:]]+/
       lengths[-1]*=i.to_f
     when " "
+    when /^\([^\)]*\)/
+      mod<<i
     else
       lengths<<1
       notes<<"#{mod*""}#{i}"
@@ -2269,6 +2285,7 @@ def tie d,tbase
   line
 end
 # repeat block analysis: no relation with MIDI format
+# '(:..)' => '(lastcmd:..)'
 def repCalc line,macro,tbase
   rpt=/\[([^\[\]]*)\] *([[:digit:]]+)/
   line.gsub!(rpt){$1*$2.to_i} while line=~rpt
@@ -2284,17 +2301,18 @@ def repCalc line,macro,tbase
       r ? r : b
     end
   }*""
-  a=line.scan(/\/[^\/]+\/|\[|\]|\.FINE|\.DS|\.DC|\.\$|\.toCODA|\.CODA|\.SKIP|\$\{[^ \{\}]+\}|\$[^ ;\$_*^,\)\(`'\/+-]+|\([^\)]*:|\)|./)
+  regex=/\/[^\/]+\/|\[|\]|\.FINE|\.DS|\.DC|\.\$|\.toCODA|\.CODA|\.SKIP|\$\{[^ \{\}]+\}|\$[^ ;\$_*^,\)\(`'\/+-]+|\([^\)]*:|\)|./
+  a=line.scan(regex)
   a=a.map{|i|
     if i=~/^\/[^\/]+\//
       if i=~/\$/
         i=i.gsub(/\$\{([^ ;\$_*^,\)\(`'\/+-]+)\}/){macro[$1]}.gsub(/\$([^ ;\$_*^,\)\(`'\/+-]+)/){macro[$1]}
       end
-      multiplet(i,tbase)
+      multiplet(i,tbase).scan(regex)
     else
       i
     end
-  }
+  }.flatten
   hs={}
   a.each_with_index{|d,i|hs[i]=d}
   hs=hs.invert
@@ -2351,6 +2369,10 @@ def repCalc line,macro,tbase
       pointDS=countertmp
     when ";"
       current=""
+    when /^\(([^\)]+):$/
+      lastcmd=$1 if $1 != "C"
+    when "(:"
+      current="(#{lastcmd}:"
     else
       current
     end
@@ -2426,6 +2448,12 @@ class Smml
     @octave=:near
     @vfuzzy=2
     @autopan=true
+    @strictmode=false
+  end
+  def strict
+    @autopan=false
+    @vfuzzy=0
+    @strictmode=true
   end
   def self.syntax
     hintminimum
@@ -2443,7 +2471,7 @@ class Smml
     puts @mx.percussionList.select{|i|i=~/#{k}/i}
   end
   def init test,fz
-    @mx.prepare(@bpm,@tbase,@velocity,@octave,@vfuzzy)
+    @mx.prepare(@bpm,@tbase,@velocity,@octave,@vfuzzy,@strictmode)
     @mx.setfile(@infile)
     @mx.setmidiname(@outfile) if @outfile
     @mx.setdata(@data) if ! @mx.getdata

data/lib/smml/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smml
 version: !ruby/object:Gem::Version
-  version: 0.1.2.1
+  version: 0.1.3
 platform: ruby
 authors:
 - tabasano