smml 0.1.13 → 0.1.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e98825702f8770b16248f090e7dca0a3890eb91
-  data.tar.gz: d2b6e346dbd790585f5534e8f626e1635bac8cbb
+  metadata.gz: 28e0baacf3d9353733f053491b93b434a4588be4
+  data.tar.gz: 643c31f2dce680edc672956aeecfe64d7318b7f4
 SHA512:
-  metadata.gz: 65904b8614d1f1df18564cfa439f54219a8dfb1518709582d42a3a06fcf58bc60566fd162b6a92bf26ca48cbf9c665b179ea1193001442ff54faf2b28d9cf52d
-  data.tar.gz: 43fd189cf0d48058b21d802b4f62b55eb293b4fbe33e669c907f3197b434e79aaa2fec21b50f6a1c3356965fc85db1db664da71e0bc002339fc66914de1b423b
+  metadata.gz: 489a4173ea0e7fc0c4ac97bea96db96529797d6c609fece01b9501cafc1c9f81f4913471edfd2a61ed12a5650623dbd5d73e9a1ad75da594c6349f30c8ff8a9e
+  data.tar.gz: b4c22c2cc0d337ab16a189729ea6e9dcadb7fdea888bf7334f588b8e573bc08d12e05948f4054035463ddfe2cd410d9777671430efc68983e5329b42afe6ef6b

data/lib/smml/msm.rb

@@ -368,7 +368,7 @@ module MmlReg
   @@h[:velocity]="v[[:digit:]]+"
   @@h[:note]="[abcdefgACDFGr]|\\{[[:digit:]]+\\}"
   @@h[:note?]="[BE]"
-  @@h[:dummyNote]="o|m|O|M"
+  @@h[:dummyNote]="o|m|O|M|n|N|x"
   @@h[:randNote]="\\?"
   @@h[:sound]="_[^!]+!|="
   @@h[:tieNote]="~|w"
@@ -625,6 +625,23 @@ class Notes < Hash
   def initialize
     @@notes.each{|k,v|self[k]=v}
   end
+  def self.up n,type
+    return self.down(n) if type==:down || (type==:random && rand(2)==1)
+    case n
+    when "a".."f"
+      n.succ
+    when "g"
+      "a"
+    else
+      n
+    end
+  end
+  def self.down n
+    case n
+    when "a".."g"
+      @@invert[(@@notes[n]-1)%12].downcase
+    end
+  end
   def self.offset a,b="c"
     r=@@notes[a]-@@notes[b]
     if r>6
@@ -1396,6 +1413,7 @@ module MidiHex
     @scalenotes=ScaleNotes.new.reset
     @gtune=guitarTuning
     self.setDefault
+    @dummymarknotenum=0
     @chmax=15
     @bendrangemax=24
     file="midi-programChange-list.txt"
@@ -1407,6 +1425,10 @@ module MidiHex
     self.loadPercussionMap(pfile)
     self.dumpstatus if $DEBUG && $debuglevel>3
   end
+  def self.setOctaveNear v
+    v= v ? :near : :fixed
+    @octmode=v
+  end
   def setBendRangeMax v
     @bendrangemax=v
   end
@@ -1484,6 +1506,20 @@ module MidiHex
     cent= @bendCentOn ? 100.0 : 1
     @bendCent=@bendHalfMax/@bendrange/cent
   end
+  
+  def self.nType v
+    @nType=
+      case v
+      when /^ra?nd/
+        :random
+      when /^up/
+        :up
+      when /^down/
+        :down
+      else
+        :up
+      end
+  end
   def self.vibratoType m
     @vibratoType=
        case m
@@ -1520,7 +1556,10 @@ module MidiHex
   # track initialize
   def self.trackPrepare tc=0
     self.getDefault
-    @dummyNoteOrg=["o","O"]
+    @chordStack=[]
+    @chordStackNum=0
+    @nType=:up
+    @dummyNoteOrg=["o","O","x"]
     @multidummySize=3
     @basekeybend=0
     @theremin=false
@@ -1629,10 +1668,17 @@ module MidiHex
     r<<self.bend(pos,depth.to_s,ch)
     r
   end
+  def self.predummyword
+    "sound"
+  end
+  def self.dummymarknote n,preword=self.predummyword
+    "__#{preword}_#{n}__"
+  end
   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
+    dummymark=(key=="x")
     key=self.rndNote if @dummyNoteOrg.member?(key)
     key+=sharp
     @key=[[key,0x7f].min,0].max
@@ -1645,7 +1691,11 @@ module MidiHex
     end
     velocity-=rand(@velocityFuzzy) if @velocityFuzzy>0
     velocity=[velocity,0x7f].min
-    key=format("%02x",@key)
+    keydata=format("%02x",@key)
+    if dummymark
+      @dummymarknotenum+=1
+      keydata=self.dummymarknote(@dummymarknotenum)
+    end
     ch=format("%01x",ch)
     vel=format("%02x",velocity)
     start=@waitingtime
@@ -1654,7 +1704,7 @@ module MidiHex
     @lenForGate=false
     @nowtime+=start
     r=[]
-    r<<Event.new(:e,start," 9#{ch} #{key} #{vel} # #{start} later, sound on note #{Notes.nDisplay(@key)} velocity #{velocity}\n")
+    r<<Event.new(:e,start," 9#{ch} #{keydata} #{vel} # #{start} later, sound on note #{Notes.nDisplay(@key)} velocity #{velocity}\n")
     b=@preAfter.shift
     bends=expre=false
     if b
@@ -1675,13 +1725,13 @@ module MidiHex
       }
     end
     @nowtime+=slen
-    r<<Event.new(:e,slen," 8#{ch} #{key} 00 # #{slen}(gate:#{@gateRate})- #{len.to_i}(#{len.round(2)})ticks later, sound off [#{(@nowtime/@tbase).to_i}, #{@nowtime%@tbase}]\n")
+    r<<Event.new(:e,slen," 8#{ch} #{keydata} 00 # #{slen}(gate:#{@gateRate})- #{len.to_i}(#{len.round(2)})ticks later, sound off [#{(@nowtime/@tbase).to_i}, #{@nowtime%@tbase}]\n")
     r<<self.bend(0,bendStart) if bends
     @bendNow=bendStart
     r<<self.expre(0,127) if expre
     if rest>0
       @nowtime+=rest
-      r<<Event.new(:end,rest," 8#{ch} #{key} 00  # #{rest} len-gate\n")
+      r<<Event.new(:end,rest," 8#{ch} #{keydata} 00  # #{rest} len-gate\n")
     end
     r
   end
@@ -1691,9 +1741,9 @@ module MidiHex
   def self.rndNote useScale=true
     key=rand(0x7f)
     key=self.note2key(@scalenotes.sample) if @scalenotes.size>0 && useScale
-    if @downRandDummy && @lastRandNote
+    if @updown==:down && @lastRandNote
       key-=12 while key>@lastRandNote && key>12
-    elsif ! @downRandDummy && @lastRandNote
+    elsif @updown==:up && @lastRandNote
       key+=12 while key<@lastRandNote && key<127-12
     end
     @lastRandNote=key
@@ -1703,11 +1753,16 @@ module MidiHex
     len+=len*self.getswing(swing)
     vel=@velocity
     vel+=@accentPlus
-    @downRandDummy=false
-    if key=="?"
+    case key
+    when "?"
       key=rndNote
-    elsif key=="O"
-      @downRandDummy=true
+      @updown=:no
+    when "o"
+      @updown=:up
+    when "O"
+      @updown=:down
+    else
+      @updown=:no
     end
     key=@preNote.shift if @preNote.size>0
     len=@preLength.shift if @preLength.size>0
@@ -1736,7 +1791,12 @@ module MidiHex
   end
   def self.noteCalc c,last,base
     n=@notes[c]
-    n+=self.notesharp(c,0)
+    case n
+    when Fixnum
+      n+=self.notesharp(c,0)
+    when Array
+    else
+    end
     if @octmode==:near && n.class != Array
       if last
         n+=12 if last-n>6
@@ -1763,6 +1823,14 @@ module MidiHex
       sharpFloat=s-sharp
     end
     bendStart=@bendNow
+    c=case c
+      when "n"
+        Notes.up(@lastnoteName,@nType)
+      when "N"
+        Notes.down(@lastnoteName)
+      else
+        c
+      end
     @lastnoteName=c
     @basekey=@basekeyCenter+12*(rand(5)-2) if @broken
     n,@lastnote,@basekey=self.noteCalc(c,@lastnote,@basekey)
@@ -1788,8 +1856,25 @@ module MidiHex
     chord=chord.orotate(1) while chord[0]<base-limit
     chord
   end
+  def self.setChordStack s
+    @chordStack=s.split(",")
+  end
+  def self.cstack c
+    if @chordStack.size>0
+      c=@chordStack[@chordStackNum]
+      @chordStackNum+=1
+      @chordStackNum%=@chordStack.size
+    end
+    c
+  end
   def self.chordName c,l=false,accent=false,sharp=0,swing=false
     l+=l*self.getswing(swing)
+    case c
+    when "N"
+      c=self.cstack(c)
+    when "="
+      c=@lastchordName
+    end
     same=false
     same=(@lastchordName==c) if @lastchordName
     if same
@@ -2468,14 +2553,28 @@ module MidiHex
       STDERR.puts "register: no data"
     end
   end
-  def self.setSwing k,v,hs=@swingHash
-    v=v.to_f
+  def self.setSwing k,value,hs=@swingHash
+    v=value.to_f
     k=~/of/
     if $&
       k,all=$`.to_i,$'.to_i
+      if value=~/%/
+        percent=$`.to_f
+        v=all*1.0*percent/100
+      elsif value=~/rest/
+        v=all-hs[all-k]
+      end
       hs[k]=v
       hs[all-k]=all-v
     else
+      case value
+      when /shorter([[:digit:]]+)?/
+        rate=0.9**($1 ? $1.to_i : 1)
+        v=k.to_i*rate
+      when /longer([[:digit:]]+)?/
+        rate=1.1**($1 ? $1.to_i : 1)
+        v=k.to_i*rate
+      end
       hs[k.to_i]=v
     end
   end
@@ -2780,6 +2879,8 @@ module MidiHex
       when /^\(set":(.*)\)/
         d=$1.split(",")
         @h<<[:call,:setRegister,*d]
+      when /^\(cStack:(.*)\)/
+        @h<<[:call,:setChordStack,$1]
       when /^\(setSwing:(.*)\)/
         d=$1.split(",")
         @h<<[:call,:setSwing,*d]
@@ -2827,6 +2928,12 @@ module MidiHex
         @h<<[:call,:preBefore,s]
       when /^\(roll:(.*)\)/
         @shiftbase=$1.to_i
+      when /^\(near:(.*)\)/
+        sw=false
+        sw=true if $1=~/^on/
+        @h<<[:call,:setOctaveNear,sw]
+      when /^\(nType:(.*)\)/
+        @h<<[:call,:nType,$1]
       when /^\(vibratoType:(.*)\)/
         @h<<[:call,:vibratoType,$1]
       when /^\(vibrato:(.*)\)/
@@ -3005,23 +3112,24 @@ module MidiHex
         last=@h[-1]
         @h<<[:comment,"= same sound"]
         if lastwait.size>0
+          lastwait[0][1]="=" if lastwait[-1]==[:chordName, "N"]
           wait+=lastwait
         else
           @h<<last
         end
       when "r"
         wait<<[:rest,i]
-      when "o","O"
+      when "o","O","?","x"
         wait<<[:dummyNote,i]
       when " "
-      when "?"
-        wait<<[:dummyNote,"?"]
       when "m"
         @h<<[:call,:resetRand]
         wait<<[:chord,["??"]]
       when "M"
         @h<<[:call,:resetRand]
         wait<<[:chord,["?O"]]
+      when "n","N"
+        wait<<[:sound,i]
       else
         if @notes.keys.member?(i)
           wait<<[:sound,i]
@@ -3181,7 +3289,7 @@ end
 def multiplet d,tbase
   d=~/\/((\*)?([[:digit:].]+)?:)?(.*)\//
   tickmode=$2
-  i=$4
+  nbody=$4
   rate=$3 ? $3.to_f : 1
   rate=1 if rate==0
   if tickmode
@@ -3190,7 +3298,7 @@ def multiplet d,tbase
     total=tbase*rate
   end
   regex=MmlReg.multipletr
-  r=i.scan(/#{regex}|./)
+  r=nbody.scan(/#{regex}|./)
   lengths=[]
   notes=[]
   mod=[]
@@ -3212,6 +3320,7 @@ def multiplet d,tbase
       lengths[-1]*=s
     # length
     when /^[[:digit:]]+/
+      STDERR.puts "multiptet: syntax error (:) ?" if not lengths[-1]
       lengths[-1]*=i.to_f
     when " "
     when /^\([^\(\):,]*:.*\)/
@@ -3610,7 +3719,7 @@ class Smml
       @mx.trackMake(t,tc-1)
     }.flatten
     puts alla if $DEBUG
-    all=alla.map{|i|i.commentoff("","#")}*""
+    all=alla.map{|i|i.commentoff("","#").gsub(/__#{@mx.predummyword}_[[:digit:]]+__/){"7F"}}*""
     array=[all.split.join]
     @binary = array.pack( "H*" )
   end

data/lib/smml/version.rb

@@ -1,3 +1,3 @@
 class Smml
-  VERSION = "0.1.13"
+  VERSION = "0.1.14.4"
 end

data/tutorial_smml.md

@@ -116,6 +116,7 @@ if you don't, smml sets panpot values automatically.
 ```
 
 ;; a melody goes near up/down side note without octave commands as default.
+after '(near:off)', near-mode is off.
 
 ```
 [ cdefgab ] 4
@@ -255,6 +256,14 @@ is the same to
 
 minus value is for to stroke up. currently, up value affects once only as it simulates playing the guitar. 
 
+
+to skip cmd for repetition, use pre '^'. so '(:-)' in an example below means '(stroke:-)'
+
+```
+(stroke:4) {a,b,c} = = (^skipCmd:..) (:-)  = = = 
+```
+
+
 ## sharp, flat
 ;; note name etc. is case sencitive, so each of 12 notes in one octave can be expressed by one charactor. 
 ;; but in other cases,
@@ -640,6 +649,22 @@ another random note.
  (?:a,b,40,45,90,12)    ;; select from a note number or name list.
 ```
 
+
+'n' as next note, case by case.
+
+```
+ ennn                     ;; upside next note   ; efga
+ eNNN                     ;; downside next note ; edcb
+ (cStack:f,g,c):N,:N,:N,  ;; next chord in chordStack ; :f,:g,:c,
+```
+
+to change 'n', next note type, to up/down/random in scale, use
+
+```
+ (nType:up)
+```
+
+
 ## tonality
 
 ```
@@ -855,6 +880,8 @@ now, note type commands are :
       ?         ;; random note
       o         ;; dummy note ; use a random note if there is no substitution command
       m         ;; multi dummy note ; similiar to  '{?,?,?}'
+      n         ;; next up note   ; cnnn => cdef
+      N         ;; next down note ; cNNN => cbag
 ```
 
   and other commands are with parentheses.
@@ -921,18 +948,33 @@ easy way to express fuzzy swing rythm.
  (setSwing: 2, 2.4)(setSwing: 1, 0.6) /:a2,b1,/
  (setSwing: 2, 1.8)(setSwing: 1, 1.2) /:a2,b1,/
 ```
+
 series of ```ab``` ,
 just 2:1, first longer, first shorter. rythm will be broken if setting part is wrong.
 
 ```
  (setSwing: 2of3, 2.4)/:a2,b1,/
+ (setSwing: 2of3, 80%)/:a2,b1,/
 ```
 
-same as the second line of above. key value must be integer, not float.
+the first line is the same as the second line of above. key value must be integer, not float.
 '2of3' and '1of5' can be used at once, but rythm will not be what you predict.
 value for 1of3 , set by rest of 2of3, is overwitten by 1of5.
 there is no way to help it.
 
+
+the second line sets values by percentage ; 1of3:2of3 => 20%of3:80%of3 => 0.6:2.4.
+
+
+```
+ (setSwing: 1, shorter)(setSwing: 2of3, rest)   ;; after that,  /:a1,b2,/ => /:a0.9b2.1/
+ (setSwing: 1, shorter2)(setSwing: 2of3, rest)  ;; now value is 0.9**2, 0.81, and so on.
+ (setSwing: 1, longer)(setSwing: 2of3, rest)    ;; /:a1,b2,/ => /:a1.1b1.9/
+```
+
+set 1 shorter/longer then set 2of3 the rest of it.
+
+
 ;; register of modifiers
 
 ```
@@ -1017,14 +1059,18 @@ i play the piano and other instruments, but it took another long time to learn w
 at first i felt like starting write music again in a computer, windows pc. i searched softwares.
 midi is best for me, i thought. cherry is good. i tried it by my pc keyboard.
 soon i felt uncomfortable. it is too ...
+
+
 i plays the piano that has midi out/in. for me, i thought it is better to use a stand alone midi sequencer with connecting my e-piano as a keyboard.
 i got and tried QY70 etc.
 it was useful. 
 a little bit later, again, i felt uncomfortable. it is too much ...
+
+
 set chords, select preset tracks, set melodies, then soon i was able to listen music. great. too much useful, i don't need to complete details.
 dont need to study or make jazz, latin, ethnic patterns. only to do is to select preset ones.
 to play the piano is not too difficult, but to play with click sounds is not comfortable. it is not interesting work.
-it is better than midi event writing with a pc keyboard. but it must be another way to write music for me and some people who don't wanna be machines.
+it is better than midi event writing with a pc keyboard. but there must be another way to write music for me and some people who don't wanna be machines.
 MML is best for writing music easily, if able to sing do-re-mi.
 let's say good-bye to irritate click sounds, mouses and pianos?! lol
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smml
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14.4
 platform: ruby
 authors:
 - tabasano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-03 00:00:00.000000000 Z
+date: 2014-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler