smml 0.1.8.2 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21c1875b3d3c6af5a1ab009c3061b3b414fc38a7
-  data.tar.gz: 81e2af2f63f365d8e8023cce052b5568055a6eb2
+  metadata.gz: 85649d364edc63918512902fb5a190e1a9ae3bcc
+  data.tar.gz: 0abe67520e10480fe4dee9fd115b7f33ec1805e9
 SHA512:
-  metadata.gz: 05da008c658c956c680682349dc51ea61e82947d20d9f5ba9dff6e6c332adef2829ce81e27392bdd00be622e8bda06c7f16ceb38454200c409eb1ac81949223f
-  data.tar.gz: ba55e9d66319fb206069149b90b2b436714ddaaaf0b12318049531e3b4ff5fa4dd1f1fd548ef60aa87bd85b6bd55cf6c8461387d87fee8f63bd7931191234ae3
+  metadata.gz: 8db3bd75b42f437b91c8811f8be7c8beaf7ea057f1a7b04c3bd62c7cebdfcb228561f9deb80b848db00fe625b8336c7dfc4506fde10dd83a6195ec09ed8b794f
+  data.tar.gz: fe2ade57a8a79b77fb085e3a4f7f6cdcc84a5dbb4f6ada084c736af5e66bf5a109acbd2e0e2afc7e6a2197b29c4b5b93ccc09f976a1221eea3b1a09256ca2734

data/lib/smml/msm.rb

@@ -192,7 +192,7 @@ module MmlReg
     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])
+    self.r([:note2,:word,:note,:sound,:chord,:num,:sharp,:octave,:mod])
   end
   def self.macroDefr
     self::MacroDef
@@ -217,6 +217,7 @@ module MmlReg
     :macro,
     :repStart,
     :repEnd,
+    :note2,
     :word,
     :modifier,
     :sharp,
@@ -249,6 +250,7 @@ module MmlReg
   ]
   @@h[:repmark]="\\.FINE|\\.DS|\\.DC|\\.\\$|\\.toCODA|\\.CODA|\\.SKIP"
   @@h[:comment]="\\( *comment[^\(\)]*\\)"
+  @@h[:note2]="\\( *tne *:[^\(\)]*\\)"
   @@h[:word]="\\([^\(\):]*:[^\(\)]*\\)"
   @@h[:wordStart]="\\([^\(\):]*:"
   @@h[:sharp]="\\([+-]*[[:digit:]\\.]*\\)"
@@ -431,6 +433,8 @@ class Notes < Hash
     "u"=>[6,@@rythmChannel]
   }
   @@invert=@@notes.invert
+  12.times{|i|@@notes[":#{i}"]=i}
+  12.times{|i|@@notes[":-#{i+1}"]=-i-1}
   @@octave=12
   def initialize
     @@notes.each{|k,v|self[k]=v}
@@ -1027,7 +1031,7 @@ end
 module MidiHex
     BendMax=16383
     BendHalf=8192
-  # 設定のため最初に呼ばなければならない
+  # initialize
   def self.prepare bpm=120,tbase=480,vel=0x40,oct=:near,vfuzzy=2,strict=false
     @ready=true
     @bendHalfMax=BendHalf
@@ -1156,6 +1160,7 @@ module MidiHex
     self.bendCentReset
     @lastbend=0
   end
+  # track initialize
   def self.trackPrepare tc=0
     self.getDefault
     @theremin=false
@@ -1187,17 +1192,20 @@ module MidiHex
     "
 # Standard MIDI File data start
 # header
-      4D 54 68 64  # ヘッダ
-      00 00 00 06  # データ長:6[byte]
-      00 #{format} # フォーマット
-      00 #{track}  # トラック数
-      #{tbase}      # 1 拍の分解能 #{@tbase}
+      4D 54 68 64  # header
+      00 00 00 06  # length of data :6[byte]
+      00 #{format} # format
+      00 #{track}  # track number
+      #{tbase}      # tiks; division of a beat #{@tbase}
     "
   end
-  def self.byGate len,g=@gateRate
+  def self.byGate len,g=@gateRate,lenforgate=false
+    lenforgate||=len
     g=@preGate.shift if @preGate.size>0
-    l=(len*1.0*g/100).to_i
+    gl=(lenforgate*1.0*g/100).to_i
+    l=gl+(len-lenforgate)
     r=len-l
+    l,r=len,0 if len<lenforgate
     [l,r]
   end
   def self.soundOn key=@basekey,velocity=@velocity,ch=@ch,sharp=0
@@ -1235,7 +1243,7 @@ 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
+  def self.thereminNote pos,key,velocity,ch,exp=@expression
     r=[]
     @expression=exp
     if @expression
@@ -1252,20 +1260,21 @@ module MidiHex
   end
   def self.oneNote len=@tbase,key=@basekey,velocity=@velocity,ch=@ch,sharp=0
     bendStart=@bendNow
-    velocity=@preVelocity.shift if @preVelocity.size>0
-    gate=@gateRate
     ch=[ch,0x0f].min
-    velocity-=rand(@velocityFuzzy) if @velocityFuzzy>0
-    velocity=[velocity,0x7f].min
     key+=sharp
     @key=[[key,0x7f].min,0].max
     return self.thereminNote(len,key,velocity,ch) if @theremin
+    velocity=@preVelocity.shift if @preVelocity.size>0
+    gate=@gateRate
+    velocity-=rand(@velocityFuzzy) if @velocityFuzzy>0
+    velocity=[velocity,0x7f].min
     key=format("%02x",@key)
     ch=format("%01x",ch)
     vel=format("%02x",velocity)
     start=@waitingtime
     @waitingtime=0
-    slen,rest=self.byGate(len,gate)
+    slen,rest=self.byGate(len,gate,@lenForGate)
+    @lenForGate=false
     @nowtime+=start
     r=[]
     r<<Event.new(:e,start," 9#{ch} #{key} #{vel} # #{start} later, sound on note #{@key} velocity #{velocity}\n")
@@ -1297,7 +1306,7 @@ module MidiHex
     r
   end
   def self.dummyNote key,len,accent=false,sharp=0
-    vel=@velocity
+    vel=@veloecity
     vel+=@accentPlus
     if key=="?"
       key=rand(0x7f)
@@ -1328,32 +1337,43 @@ module MidiHex
     vel+=@accentPlus if accent
     self.oneNote(len,key,vel,@rythmChannel,sharp)
   end
-  def self.notes c,l=false,accent=false,sharp=0,sharpFloat=false
-    bendStart=@bendNow
-    @lastnoteName=c
+  def self.noteCalc c,last,base
     n=@notes[c]
     if @octmode==:near && n.class != Array
-      if @lastnote
-        n+=12 if @lastnote-n>6
-        n-=12 if @lastnote-n<-6
+      if last
+        n+=12 if last-n>6
+        n-=12 if last-n<-6
       end
-      @lastnote=n
-      (@basekey+=12;@lastnote-=12) if n>=12
-      (@basekey-=12;@lastnote+=12) if n<0
-      n=@lastnote
+      last=n
+      (base+=12;last-=12) if n>=12
+      (base-=12;last+=12) if n<0
+      n=last
+    end
+    [n,last,base]
+  end
+  def self.notes c,l=false,accent=false,sharp=0,sharpFloat=false
+    if sharpFloat && (sharpFloat!=0)
+      s=sharp+sharpFloat
+      sharp=s.to_i
+      sharpFloat=s-sharp
     end
+    bendStart=@bendNow
+    @lastnoteName=c
+    n,@lastnote,@basekey=self.noteCalc(c,@lastnote,@basekey)
     r=[]
     if sharpFloat && sharpFloat!=0
       v=sharpFloat*@bendHalfMax/@bendrange
       v=sharpFloat*100 if @bendCentOn
-      v+=bendStart
-      r<<self.bend(0,v)
       @bendNow=v
+      v+=bendStart
+      r<<self.bend(0,v) if not @theremin
       r<<self.notekey(n,l,accent,sharp)
-      r<<self.bend(0,bendStart)
+      r<<self.bend(0,bendStart) if not @theremin
       @bendNow=bendStart
     else
       r<<self.notekey(n,l,accent,sharp)
+#      r<<self.bend(0,bendStart)# if bends
+#      @bendNow=bendStart
     end
     r
   end
@@ -1576,7 +1596,7 @@ module MidiHex
     case d
     when "+" ; c+=explus
     when "-" ; c-=explus
-    else     ; c=d
+    else     ; c=d.to_i
     end
     c=midiVround(c)
     @expression=c
@@ -1808,6 +1828,12 @@ module MidiHex
     end
     @trackName[@tracknum]=n
   end
+  def self.setlenforgate g
+    # set temporary len for gaterate; for internal purpose
+    # (g:70)...f~~           => 70% of 3, gate rest is 30% of 3
+    # (g:70)...(gl:1.0)f~~   => 70% of 1.0, gate rest is 30% of 1.0
+    @lenForGate=g.to_f*@tbase
+  end
   def self.preLength v
     @preLength=v.map{|i|
       case i
@@ -1939,6 +1965,62 @@ module MidiHex
     @marktrack.set(m,@tracknum,@nowtime)
     Event.new(:mark,m,@tracknum,@nowtime)
   end
+  def self.calcNoteFloat n,sharp,sharpFloat,base
+    n=@notes[n] if n.class==String
+    n+sharp+sharpFloat+base
+  end
+  def self.tneMid now,last,len,transitionrate
+    n0,e0,sharp0,sharpFloat0,base0=last
+    n,e,sharp,sharpFloat,base=now
+    e=e.to_i
+    e0=e0.to_i
+    stepDefault=10
+    step=stepDefault
+    lastv=self.calcNoteFloat(n0,sharp0,sharpFloat0,base0)
+    n,last,base=self.noteCalc(n,@notes[n0],base)
+    stepN=self.calcNoteFloat(n,sharp,sharpFloat,base)-lastv
+    stepE=e-e0
+    step=1 if stepE==0 && stepN==0
+    step=stepN.to_i*3 if stepN>stepDefault/3
+    transitionl=len*transitionrate
+    restl=len-transitionl
+    stepL=transitionl*1.0/step
+    stepE=stepE*1.0/step
+    stepN=stepN*1.0/step
+    r=[]
+    step.times{|i|
+      r<<self.expre(0,e0+stepE*i.succ) if e!=e0
+      r<<self.notes(n0,stepL,false,sharp0,sharpFloat0+stepN*i.succ)
+    }
+    r<<self.expre(restl,e)
+    r
+  end
+  # transition rate, note, expression
+  def self.tne arg,t,accent,sharp,sharpFloat
+    exp=@expression
+    trans,n,e=arg.split(',')
+    trans=trans.to_f
+    trans=0.3 if trans==0
+    bchange=0
+    @nowTne=[n,e,sharp,sharpFloat,@basekey]
+    if @lastTne
+      n,e,sharp,sharpFloat,base=@lastTne
+      bchange=@basekey-base
+      @basekey=base
+    else
+      @lastTne=@nowTne
+    end
+    r=[]
+    r<<Event.new(:comment,"# tne #{arg}")
+    r<<self.expre(0,e)
+    r<<self.notes(n,0,accent,sharp,sharpFloat)
+    r<<self.tneMid(@nowTne,@lastTne,t,trans)
+    r<<self.expre(0,exp)
+    @lastTne=@nowTne
+    @basekey+=bchange
+    @lastTne[-1]=@basekey
+    r
+  end
   def self.eventlist2str elist
     @eventlist=[]
     r=@eventlist
@@ -1949,6 +2031,7 @@ module MidiHex
       r<<Event.new(:raw,self.metaText("#{cmd} #{arg}")) if $DEBUG && $debuglevel>5
       r<<e
       case cmd
+      when :comment
       when :basekeyPlus
         @basekey+=arg[0]
       when :raw
@@ -2060,6 +2143,8 @@ module MidiHex
             @h<<[:percussionNote,*arg]
           when :rawsound
             @h<<[:byKey,*arg]
+          when :tne
+            @h<<[:tne,*arg2]
           when :sound
             @h<<[:notes,*arg2]
           when :dummyNote
@@ -2099,6 +2184,10 @@ module MidiHex
         tr=$2.to_i
         tr*=-1 if $1=="-"
         @h<<[:basekeyPlus,tr]
+      when /^\(tne:(.*)\)/
+        wait<<[:tne,$1]
+      when /^\(lg:(.*)\)/
+        @h<<[:call,:setlenforgate,$1]
       when /^\(theremin:(.*)\)/
         if $1=~/off/
           @h<<[:setTheremin,false]
@@ -2294,10 +2383,12 @@ module MidiHex
         p "accent" if $DEBUG
         accent=true
       when "="
+        last=@h[-1]
+        @h<<[:comment,"= same sound"]
         if lastwait.size>0
           wait+=lastwait
         else
-          @h<<@h[-1]
+          @h<<last
         end
       when "r"
         wait<<[:rest,i]
@@ -2484,7 +2575,7 @@ def multiplet d,tbase
     when /^[-+]+[[:digit:]]*/,/^[\^`',<>]/,/^\([-+]*[[:digit:]]?\)/
       mod<<i
     # note
-    when /^\((\?|x|C|chord):[^\)]+\)|^\^?:[^,]+,|^=/
+    when /^\((\?|x|C|chord|tne):[^\)]+\)|^\^?:[^,]+,|^=/
       lengths<<1
       notes<<"#{mod*""}#{i}"
       mod=[]

data/lib/smml/version.rb

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

data/tutorial_smml.md

@@ -2,6 +2,9 @@
 
 
 ## note
+;; after setting up your environment of playing midi music,
+
+
 ;; listen to the sound of a note 'c', at first.
 
 ```
@@ -76,6 +79,9 @@ a0.5 c0.25 c0.25
 /:  a4 c2   c2  /
 ```
 
+in fact, ```/a4c2c2/``` is valid too, but it will be confusing later.
+
+
 ## gate time
 ;; real tone length is important sometimes. gate time command is a percentage of tone length. (staccato etc.)
 
@@ -148,6 +154,39 @@ c = = = d = = =
 :cmaj7, = = = :G7, = = =
 ```
 
+currently valid names are 
+
+```
+c7
+cm7
+cmaj7
+cmmaj7
+cmaj or c
+cm
+c6
+cm6
+csus4
+caug
+c+
+cdim
+cdim7
+cpower
+```
+
+followed by
+
+```
+(+5)
+(-5)
+(9) or (add9)
+(+9)
+(-9)
+(+11)
+(13)
+(-13)
+```
+
+
 ## tempo
 ;; most commands except note type ones, are inside parenthesis. set the tempo 120 bpm.
 
@@ -199,14 +238,26 @@ strange ways of sharp/flat can be affective currently. ```(+4)a``` , ```(-1.2)a`
 {50,54,58}
 ```
 
+;; use 12 series notation ; :0,:1,:2,:3 ... and :11 as notes c,C,d,D, ... and b.
+
+```
+ [ {47,56,:0,:1} === + ] 4
+```
+
+this multi-tone passage is repeated four times. ```:0``` is 'c' and ```:1``` is '(+)c', so these go to up-octave every passage effected by octave command '+' in the end of it,
+ but other absolute number notes are not affected.
+
+
 ## instrument; program change
-;; drum sound can be used anywhere, but this is not MIDI way. use instrument name.
+;; drum sound can be used anywhere, but this is not MIDI way, use instrument name.
 
 ```
 _snare! = = =
 ```
 
 ;; set instrument. automaticaly searched by even not exact name. (MIDI program change command)
+it depend on map files.
+
 
 ```
 (p:piano) c d e f (p:guitar) f e d c
@@ -218,6 +269,38 @@ _snare! = = =
 (ch:drum) {34} = = = {35} = = =
 ```
 
+
+## instrument map
+;; a MIDI Program Change event sets the instrument on a channel.
+if channel is 10, a note number means each drum instrument.
+these are decreared in map files;
+>  midi-programChange-list.txt
+
+
+>  midi-percussion-map.txt
+
+
+when there are same name files on the current directory, these are used. if not, default files in the gem will be set.
+data in these map text must start with instrument number.
+without it, the line text is used for section name. if the word 'Guitar' appears, it is included for searching keyword until the next section name line appears.
+
+```
+
+Piano Section
+1 hoge piano
+2 foo
+3 bar
+
+Guitar Section 
+4 one
+5 two
+
+```
+
+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.
+
+
 ## track
 ;; in SMF, MIDI channel is 1 - 16, and drum is in 10 channel. but currently, these are automaticaly set.
 ;; you don't need to think about it. simply seperate tracks with a command '|||'.
@@ -234,18 +317,8 @@ _snare! = = =
 ||| (p:guitar) g a b c
 ```
 
-;; the same track name, the same MIDI channel and setting.
-
-```
-    (track:foo) (p:organ) aa
-||| (track:foo) bb
-||| (track:hoge) cc
-```
-
-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,
+currenly track names are not used as default, 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.
 
 ```
@@ -258,7 +331,18 @@ use blank tracks by track seperaters.
 ||| def   ;; track 3
 ``` 
 
- 
+
+;; the same track name, the same MIDI channel and setting.
+
+```
+    (track:foo) (p:organ) aa
+||| (track:foo) bb
+||| (track:hoge) cc
+```
+
+first two tracks are 'organ' sound by the same track names declared.
+
+
 ## page
 ;; then seperate pages by three or longer one line '/'.
 ;; but this command do not adjust time potisions. it simply resets track number increment.
@@ -266,18 +350,18 @@ use blank tracks by track seperaters.
 ```
   cdef|||efga|||gabc
   ////////////////////
-  cdef|||efga|||gabc
+  c2d2e2f2|||e2f2g2a2|||g2a2b2c2
   ///////////////////
-  cdef|||efga|||gabc
+  c3def|||e3fga|||g3abc
 ```
 
 ;; the same to below.
 
 ```
-cdef cdef cdef ||| efga efga efga ||| gabc gabc gabc
+cdef c2d2e2f2 c3def ||| efga e2f2g2a2 e3fga ||| gabc g2a2b2c2 g3abc
 ```
 
-;; if you want to adjust tracks, use a blank page by two lines of page seperaters. the last three 'c' will be played adjusted.
+;; if you want to adjust tracks, use a blank page by two lines of page seperaters. the last three 'c' will be played adjusted instead each preceding note lengths are different.
 
 ```
 cd ||| e ||| abcde 
@@ -292,9 +376,9 @@ c|||c|||c
 ```
 cd ||| e ||| abcde 
 ////////////////////
-    (mark:positionName)  c
-||| (mark:positionName)  c
-||| (mark:positionName)  c
+    (mark:positionName)  c  ;; track 1
+||| (mark:positionName)  c  ;; track 2
+||| (mark:positionName)  c  ;; track 3
 ```
 
 these are played like  this.
@@ -314,42 +398,12 @@ 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)'
+or use a comma as a seperater of a name and a counter; '(mark:hoge@3)' = '(mark:hoge,3)'.
 
 ```
   a b c (mark:m) a b c (mark:m@2) a b c (mark:m@3)
 ```
 
-## instrument map
-;; a MIDI Program Change event sets the instrument on a channel.
-if channel is 10, a note number means each drum instrument.
-these are decreared in map files;
->  midi-programChange-list.txt
-
-
->  midi-percussion-map.txt
-
-
-when there are same name files on the current directory, these are used. if not, default files in the gem will be set.
-data in these map text must start with instrument number.
-without it, the line text is used for section name. if the word 'Guitar' appears, it is included for searching keyword until the next section name line appears.
-
-```
-
-Piano Section
-1 hoge piano
-2 foo
-3 bar
-
-Guitar Section 
-4 one
-5 two
-
-```
-
-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, 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.
@@ -656,6 +710,7 @@ pitch bend 100 of note 'c'.
 ```
 
 '+' relative value. if these are after above, three notes are bend 100 of 'c', bend 200 of 'c' and bend 0 of 'c'.
+bend data is effective permanently until reseted by ```(bend:0)```.
 
 
 ```
@@ -715,10 +770,12 @@ now, note type commands are :
 
 ```
       c         ;; single note
+      C         ;; c sharp
       (-)d      ;; single note with flat/sharp/natural modifiers
       {64}      ;; single note by absolute note number
       _snare!   ;; drum note by instrument name search keyword 'snare'
       {d,g,-b}  ;; multi note
+      {47,:0}   ;; multi note. second note is by 12 series half tone notation
       :cmaj7,   ;; chord name
       =         ;; copy of the latest note type command
 ```
@@ -737,6 +794,25 @@ ab /:cde/ f
 
 after on command, data is manipulated as bend data inside smml. not completed about modifiers for this.
 
+;; easy way to write smooth expression and note transition
+(experimental; experimental notations may be deleted or hidden to internal purpose only later.)
+
+
+```
+ (tne:0.3,c,127) 3
+```
+
+3 beat lengths of note 'c' with expression level 127 transition time rate 0.3 connected from the last note.
+
+;; length for gate
+(experimental)
+
+```
+(g:70)
+f~~(lg:1.0)f~~f~~
+```
+
+rest of second 'f' is 30% of one beat instead others are 30% of three beats.
 
 ## preprocess
 ;; some pre-process commands.

metadata

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