smml 0.1.3.1 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f60c5da7faf59812d18845c1ae2a5454bc9444f
-  data.tar.gz: 832b1493ec1af0deb3f22df0e9348db0f47ef257
+  metadata.gz: 3adeb15710c27d8fffde8600d6566f00530fd1e2
+  data.tar.gz: 5589cb7b1d51a32246176a770d8ac4ccdbaa1275
 SHA512:
-  metadata.gz: 6b792328cd68182ac47d0bce2c98aa725e2b9b58389525dc7226c667e8f473efdc76a6f091122bda92610e68eec4e4bf4e15ed1d4828e441c343f73ca16da4cc
-  data.tar.gz: 29caddd563afe13f38f6616a21dd64658c7d7fab6b34b6ddcd8d5d75c5f31566ee3a00aa39aca84a49888bbac8b06d3d71925a3617e8de58a3ac82d4665a0bd8
+  metadata.gz: 51def6b77027288a689991fca86e9b276b2a490fd82418f82284ba4c00e799a1eaa1060c7cf723894ca98484082539b983f03bbd62fecf1d6929a9ce9d1c6b65
+  data.tar.gz: 8f393f35c258a5e8791d426dab9db5d72d3d105d944cf0fb063b7e52aac316e3c7b644dce4f06bdea6d957783ba46884555b1e1f2b8cd5a069635c9712f83a50

data/lib/smml/msm.rb

@@ -16,6 +16,7 @@ usage:
        #{cmd} -i infile.txt  -o outfile.mid
    show syntax
        #{cmd} -s
+   for farther details, see tutorial_smml.md in gem
 EOF
 end
 def showsyntax
@@ -495,6 +496,9 @@ def hext2hex d
   r=ar if hex
   r
 end
+def midiVround v
+  [[v,0x7f].min,0].max
+end
 def rolandcheck d
   return d if $ignoreChecksum
   if d[1]=="41"
@@ -599,7 +603,7 @@ def apply d,macro
   }*""
 end
 def rawHexPart d,macro={}
-  li=d.scan(/\$se\([^)]*\)|\$delta\([^)]*\)|\$bend\([^)]*\)|\(bend:[^)]*\)|\(expre:[^)]*\)|./)
+  li=d.scan(/\$se\([^)]*\)|\$delta\([^)]*\)|\$bend\([^)]*\)|\(bend:[^)]*\)|\(expression:[^)]*\)|\(expre:[^)]*\)|./)
   res=[]
   li.map{|i|
     case i
@@ -613,8 +617,8 @@ def rawHexPart d,macro={}
       bendHex(d)
     when /\(bend:([^)]*)\)/
       "_b__#{$1.split(',')*"_"}?"
-    when /\(expre:([^)]*)\)/
-      "_e__#{$1.split(',')*"_"}?"
+    when /\(expre(ssion)?:([^)]*)\)/
+      "_e__#{$2.split(',')*"_"}?"
     else
       i
     end
@@ -625,10 +629,15 @@ def revertPre d
     gsub(/_e__([^?]*)\?/){"(expre:#{$1.split("_")*","})"}
 end
 def worddata word,d
-  d=~/\(#{word}:(([[:digit:].]+),)?([-,.[:digit:]]+)\)/
+  d=~/\(#{word}:(([[:digit:].]+),)?([-+,.[:digit:]]+)\)/
   if $&
     pos=$1 ? $2.to_i : 0
-    depth=$3.split(',').map{|i|i.to_f}
+    depth=$3.split(',').map{|i|
+      case i
+      when "+","-" ; i
+      else         ; i.to_f
+      end
+    }
     [:"#{word}",pos,depth]
   else
     false
@@ -830,6 +839,8 @@ module MidiHex
     @strokefaster= strict ? 1 : 3
     @startBpm=bpm
     @midiname=false
+    @trackChannel={}
+    @trackName={}
     @cmark="#"
     @marktrack=MarkTrack.new
     @octmode=oct
@@ -841,6 +852,7 @@ module MidiHex
     @rythmChannel=9
     @notes=Notes.new
     @ch=0
+    @expression=0x7f
     @velocity=vel
     @velocityOrg=vel
     @velocityFuzzy=vfuzzy
@@ -853,7 +865,7 @@ module MidiHex
     @pancenter=64
     @scalenotes=ScaleNotes.new.reset
     @gtune=guitarTuning
-    @prepareSet=[@tbase,@ch,@velocity,@velocityFuzzy,@basekey,@gateRate,@bendrange,@bendCent,@scalenotes,@gtune]
+    @prepareSet=[@tbase,@ch,@velocity,@expression,@velocityFuzzy,@basekey,@gateRate,@bendrange,@bendCent,@scalenotes,@gtune]
     @chmax=15
     @bendrangemax=127
     file="midi-programChange-list.txt"
@@ -925,7 +937,7 @@ module MidiHex
     @bendCent=8192/@bendrange/100.0 if on
   end
   def self.trackPrepare tc=0
-    @tbase,@ch,@velocity,@velocityFuzzy,@basekey,@gateRate,@bendrange,@bendCent,@scalenotes,@gtune=@prepareSet
+    @tbase,@ch,@velocity,@expression,@velocityFuzzy,@basekey,@gateRate,@bendrange,@bendCent,@scalenotes,@gtune=@prepareSet
     @strokespeed=0
     @strokeUpDown=1
     @preGate=[]
@@ -939,6 +951,8 @@ module MidiHex
     tc=@chmax if tc>@chmax
     @panoftrack=panbytrack(tc)
     @ch=tc
+    @trackChannel[@tracknum]=@ch
+    @trackName[@tracknum]=""
     Event.new(:dummy).reset
   end
   def self.header format,track,tbase=@tbase
@@ -1297,7 +1311,16 @@ module MidiHex
     Event.new(:e,t," B#{ch} #{n} #{data}\n")
   end
   def self.expre len,d
-    self.controlChange("11,#{d},#{len}")
+    c=@expression
+    explus=10
+    case d
+    when "+" ; c+=explus
+    when "-" ; c-=explus
+    else     ; c=d
+    end
+    c=midiVround(c)
+    @expression=c
+    self.controlChange("11,#{c},#{len}")
   end
   def self.ProgramChange ch,inst,len=0
     ch=@ch if ch==false
@@ -1499,6 +1522,13 @@ module MidiHex
   def self.gtuning s
     @gtune=s.split(",")
   end
+  def self.trackName n
+    if @trackName.values.member?(n)
+      c=@trackName.keys.select{|k|@trackName[k]==n}[0]
+      @ch=@trackChannel[c]
+    end
+    @trackName[@tracknum]=n
+  end
   def self.preLength v
     @preLength=v.map{|i|
       case i
@@ -1862,6 +1892,9 @@ module MidiHex
         @h<<[:waitingtime,$1? $2.to_i : $2.to_f*@tbase]
       when /^\(accent:([^)]*)\)/
         @h<<[:call,:accent,$1]
+      when /^\(track:(.*)\)/
+        i=$1
+        @h<<[:call,:trackName,i]
       when /^\(on:(.*)\)/
         i=$1
         @h<<[:soundOn,i]
@@ -1879,10 +1912,11 @@ module MidiHex
         chord=$2.split.join.split(",") # .map{|i|self.note2key(i)}
         wait<<[:chord,chord]
       when /^\(text:(.*)\)/
-        @h<<[:text,$1]
+        @h<<[:metaText,$1]
       when /^\(tempo:(.*)\)/
         @bpm=$1.to_i
         @h<<[:tempo,@bpm] if @bpm>0
+      # limited random note
       when /^\(\?:(.*)\)/
         ks=$1
         if ks=~/\-/
@@ -1892,7 +1926,12 @@ module MidiHex
         else
           ks=ks.split(",")
           key=ks[rand(ks.size)]
-          wait<<[:sound,key]
+          a=:sound
+          if key=~/\A[[:digit:]]+\z/
+            a=:rawsound
+            key=key.to_i
+          end
+          wait<<[a,key]
         end
       when /^\(x:(.*)\)/
         key=$1.to_i

data/lib/smml/version.rb

@@ -1,3 +1,3 @@
 class Smml
-  VERSION = "0.1.3.1"
+  VERSION = "0.1.4"
 end

data/tutorial_smml.md

@@ -1,5 +1,8 @@
+# smml tutorial
+
+
 ## note
-;; note 'c', at first.
+;; listen to the sound of a note 'c', at first.
 
 ```
 c
@@ -9,7 +12,7 @@ c
 ;; 'r' means rest. small letters are note names. blanks can be used anywhere and will be ignored.
 
 ```
-c d e d c3 r
+ r c d e d c3 r
 ```
 ;; capital letters are notes with sharps
 
@@ -26,7 +29,7 @@ e D e f F g g2
 - e d c2
 ```
 
-;; >< tempo up down.
+;; >< tempo up/down.
 
 ```
 f r > f r > f r > f r <<< fr fr fr fr
@@ -42,22 +45,25 @@ c d0.5 d0.5 e0.25 e0.25 e0.25 e0.25
 ```
 ;; ( thus, length expression is far from standard MML. usualy it is similiar to musical note name. )
 
-## gate time
-;; real tone length is important sometimes. gate time command is a percentage of tone length. (staccato etc.)
-```
- (g:100) a b c
- (g:70)  a b c
-```
-first line is played like with a slar. second one will be played by more shorter sounds.
 ## multiplet
 ;; but above is similiar to bellow
 ```
 c /: dd / /: eeee /
 ```
-;; because for example '/3: dd /' means that two 'd' notes are set inside '3' beats.
+;; because for example '/3: dd /' means that two 'd' notes are set inside '3' beats. 
 ```
 /3: dd / /3: ddd / /3: dddddd / /3: dddddddddddd /
 ```
+
+## gate time
+;; real tone length is important sometimes. gate time command is a percentage of tone length. (staccato etc.)
+```
+ (g:100) a b c
+ (g:70)  a b c
+```
+first line is played like with a slar. second one will be played by more shorter sounds.
+
+
 ;; set velocity. max is 127.
 ```
 (v:70) c (v:40) c (v:20) c (v:70) c (v:90) c
@@ -66,6 +72,8 @@ c /: dd / /: eeee /
 ```
 (pan:>30) c d e
 ```
+if you don't, smml sets panpot values automatically.
+
 
 ## repeat phraze
 ;; repeat 3 times
@@ -126,7 +134,7 @@ strange ways can be affective currently. '(+4)a' etc.
 ```
 
 ## 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! = = =
 ```
@@ -142,7 +150,6 @@ _snare! = = =
 ## 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 '|||'.
-;; in the future, track names may be used.
 ```
 (p:piano) c d e f ||| (p:organ) e f g a ||| (p:guitar) g a b c
 ```
@@ -152,6 +159,14 @@ _snare! = = =
 ||| (p:organ)  e f g a
 ||| (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.
+
 ## page
 ;; then seperate pages by three or longer one line '/'.
 ;; but this command do not adjust time potisions. it simply resets track number increment.
@@ -166,7 +181,7 @@ _snare! = = =
 ```
 cdef cdef cdef ||| efga efga efga ||| gabc gabc gabc
 ```
-;; if you want to adjust tracks, use a blank page. 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.
 ```
 cd ||| e ||| abcde 
 ////////////////////
@@ -182,9 +197,24 @@ cd ||| e ||| abcde
 ||| (mark:positionName)  c
 ||| (mark:positionName)  c
 ```
+these are played like  this.
+```
+    cdrrr c  ;; track 1
+||| errrr c  ;; track 2
+||| abcde c  ;; track 3
+```
 ;; marks are not needed for all tracks. positions will be adjusted automaticaly to the preceeding track while the same marks exist.
 ;; like this, most commands except tempo, a command effects its belonging track only.
 
+
+```
+  [ a b c (mark:m) ] 3
+```
+;; 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.
+```
+  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.
@@ -334,6 +364,19 @@ or maybe
  e /2: cagb /
 ```
 etc.
+if a scale has been defined as below, random notes will be selected from its scale notes.
+```
+ (scale:a,b,c,d,e)
+ (scale:a,+2,+3,+5,+7,+9,+11)
+```
+still incompleted to use.
+
+
+another random note.
+```
+ [ (?:56-58) ] 4        ;; use range 56 to 58, note number. in this case, 4 times repeating maybe '{56}{56}{58}{57}' etc.
+ (?:a,b,40,45,90,12)        ;; select from a note number or name list.
+```
 
 ## transpose
 ```
@@ -346,7 +389,7 @@ major key, minor key ,modulation of keys have not been implimented  yet.
 ```
  (cc:10,64)
 ```
-controlChange number 10 value 64. see SMF format.
+controlChange number 10 value 64. see SMF format for details.
 
 ## General MIDI etc.
 ```
@@ -354,8 +397,17 @@ controlChange number 10 value 64. see SMF format.
   (gs:reset)
   (xg:on)
 ```
-after these commands, it need some time over 50 mili sec. or so for running.
+after these MIDI system commands, it need some time over 50 mili sec. or so for running.
 implementation of it is not fixed, so for adjusting, please set marks on all tracks. for example '(mark:start)'.
+or like this.
+```
+(gm:on)r
+///////////////
+///////////////
+;; sound data start
+    abc
+||| def
+```
 
 ## compile order
 now compiling order is : page,track seperate => macro set and replace => repeat check => sound data make.
@@ -441,11 +493,12 @@ preceding modifier gate rates. if next notes are 'abc' ,3rd tone 'c' is with a g
 new preceding modifiers will cancel old rest preceding values if it remains.
 
 ```
-  ^  ;; accent
-  `  ;; too fast note, play ahead
-  '  ;; too late note, lay back
+  ^  ;; accent.  for changing a value of accent base, use '(accent:15)'.
+  `  ;; too fast note, play ahead. for changing a value of shift ticks base, use '(roll:45)'.
+  '  ;; too late note, lay back. 
 ```
 set these modifiers before note commands.
+
 ```
  (loadf:filename.mid,2)
 ```
@@ -460,14 +513,48 @@ this command do not check about track data strictly. be careful.
 
 now, note type commands are :
 ```
-      'c'        ;; single note
-      '(-)d'     ;; single note with flat/sharp/natural modifiers
-      '{64}'     ;; single note by absolute note number
-      '_snare!'  ;; drum note by instrument name
-      '{d,g,-b}' ;; multi note
-      ':cmaj7,'  ;; chord name
-      '='        ;; copy of the latest note type command
+      c         ;; single note
+      (-)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
+      :cmaj7,   ;; chord name
+      =         ;; copy of the latest note type command
 ```
 
   and other commands are with parentheses.
 
+```'~'``` seems likely note type, but it is zipped to preceding note as calculated note length. most commands cannot be set inside of ```'a~~~'.```
+
+
+## preprocess
+;; some pre-process commands.
+set it in the top of file.
+
+
+```
+;; midifilename  out.mid
+;; title         this music name
+```
+
+## in pre modifier parts
+limited commands can be used. bend,expre.
+
+```
+   (A:  o  o     o     o o   o o o (bend:20,-5000,-4700,-4700,-400,-200,0,0,10000,-10000) o, )
+   (A:  o  o     o     o o   o o o (expre:20,40,+,+,+,+,-,-,-,-,+,+,+,+,-,-,-,-,+,+,+,+)   o, )
+        a  b ~ ~ c ~ ~ d e ~ f g a b                                                       c d
+```
+note loudness is result of velocity, expression and volume values multipled. expression is used for a running note etc..
+velocity for more long span, volume for total sound level etc.
+in above case, the 9th note 'b' is with modifier data, expression and bend. the first value is time interval. 
+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.
+
+## text
+text implement to MIDI file.
+```
+ (text:this_is_a_pen)
+```
+but now blanks are removed. someday maybe fixed ?
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smml
 version: !ruby/object:Gem::Version
-  version: 0.1.3.1
+  version: 0.1.4
 platform: ruby
 authors:
 - tabasano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-28 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler