smml 0.1.0.1 → 0.1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 030ec4626cbd1d8bbd61fe4e13b993ec2c27cfd6
-  data.tar.gz: f4a8aea294b67884dad7449c5ba524db6b162e76
+  metadata.gz: 5502e954b9a84c81d1589125b9c6bff866c7a47c
+  data.tar.gz: 7a54373e442e7d92e5200fd699bd99cbddff5118
 SHA512:
-  metadata.gz: c91c1d55a355e8bd9a35999df025fdbe95f1f1532e72e5f94fac6e6b9b0256a43543cf60383bf7865e5a3f692a2e3fccb3a27a2570449a32b5f5ba891936a0b3
-  data.tar.gz: fe30d0f2596410987755d5fadb450340ae7070c820e5de1b548054967b0ce7f30b680c425dad433a3f07445cc5edfcd2aaabd8011be45aa7bf00e023b897dbf5
+  metadata.gz: 3724df4add3c3d66ac9cc733149a5762bf8e899d0bf28e673d4d01b066b529d72ed612f77cca459612ea5ee06df9bd2d3669f0668fcc2f3320ac318108624117
+  data.tar.gz: f65ca001292854935dfd31c15d73d5556d7e4fee703026a864d62760c4fea85b5746b44434239caa49964f0e189fee9e484ec0f18ba648431615cb620a4cf514

data/README_smml.md

@@ -1,4 +1,4 @@
-# Smml
+# smml
 
 simple Music Macro Language to MIDI
 
@@ -28,10 +28,19 @@ in a ruby script,
     m=Smml.new
     m.compile('infile.mml','outfile.mid')
 
-Or exec command
+Or exec command.
+smml to mid (file to mid, mml data to mid, syntax, help)
 
-    $ smml -i infile.mml -o outfile.mid
-    $ smml -d "cdefgab"  -o outfile.mid
+    $ smml -i infile.mml -o out.mid
+    $ smml -d "cdefgab"  -o out.mid
+    $ smml -s
+    $ smml -h
+
+mml2smml (file to smml, mml data to smml, mml data to mid)
+
+    $ mmlsmml -i infile.mml > smmlfile
+    $ mmlsmml -d "cdefgab" > smmlfile
+    $ mmlsmml -d "cdefgab" -o out.mid
 
 ## Contributing
 

data/bin/mmlsmml

@@ -28,7 +28,7 @@ def help
 end
 
 infile="infile.mml"
-outfile="mml.mid"
+outfile=""
 data=""
 
 opt = OptionParser.new
@@ -53,7 +53,9 @@ p data
 data=data.split("\n").map{|i|i.commentoff("\n",'#')}*"\n"
 p data
 smml=Mml.tosmml(data)
-puts smml if $smmlshow || $DEBUG
+puts smml if $smmlshow || $DEBUG || outfile==""
+exit if outfile==""
+
 m.octave=:far
 m.data=smml
 m.outfile=outfile

data/lib/smml/msm.rb

@@ -92,7 +92,12 @@ syntax: ...( will be changed time after time)
     ;;;;;;     =start mark of multi-line comment. end mark is same or longer mark of ';;'. these must start from the top of line.
 
     basicaly, one sound is a tone command followed by length number. now, tone type commands are :
-      'c',  '{64}', '_snare!', '{d,g,-b}', ':cmaj7,'
+      'c'        => single note
+      '(-)d'     => single note with flat/sharp modifier
+      '{64}'     => single note by absolute note number
+      '_snare!'  => drum note by instrument name
+      '{d,g,-b}' => multi note
+      ':cmaj7,'  => chord name
     and other commands are with parentheses.
 EOF
 end
@@ -193,6 +198,22 @@ class Array
     r
   end
 end
+class ScaleNotes < Array
+  def setSampleRate c
+    @samplerate=c
+  end
+  # todo: use sample rate
+  def sample
+    self[rand(self.size)]
+  end
+  def sampleNote
+    if self.size==0
+      rand(0x7f)
+    else
+      self.sample
+    end
+  end
+end
 def unirand n,c,reset=false
   a=[0,n]
   while c>a.size
@@ -202,39 +223,97 @@ def unirand n,c,reset=false
   a.sort_by{rand}
 end
 
+# accumulated time with event
+class TotalTime
+  def initialize t=0
+    @t=t
+    @series={}
+  end
+  def set num,t
+    add(t)
+    @series[num]=@t
+  end
+  def addtime num,t
+    add(t)
+    @series[num]+=t
+  end
+  def add t
+    @t+=t
+  end
+  def get num
+    @series[num]
+  end
+  def all
+    @series
+  end
+end
+# midi event etc.
 class Event
-  attr_accessor :type, :time, :value
-  def initialize ty=:e,*arg
+  @@counter=0
+  @@tt=TotalTime.new
+  attr_accessor :type, :value
+  attr_reader :time, :number
+  def initialize ty,*arg
+    @number=@@counter
+    @@counter+=1
     @type=ty
     @pos=0
     @value=""
     case @type
-    when :c,:raw
-      @time=0
+    # event without time;  except ':e'
+    when :comment,:raw
+      settime(0)
       @value=arg[0]
     when :ahead
-      @time=arg[0]
-    when :o,:off
+      settime(arg[0])
+    when :on,:off
     when :mark
       @mark,@track,@value=arg
-    else
-      @time=arg[0]
+    # event with delta time;  ':e'
+    when :dummy
+    when :e, :end, :sys
+      settime(arg[0])
       @value=arg[1]
+    else
     end
   end
+  def settime t
+    @time=t
+    @@tt.set(@number,@time)
+    posset
+  end
+  def addtime t
+    @time+=t
+    @@tt.addtime(@number,t)
+    posset
+  end
+  def posset
+    @pos=@@tt.get(@number)
+  end
+  def showTotalTime
+    a=@@tt.all
+    a.keys.sort.map{|k|"#{k}: #{a[k]}"}
+  end
+  def reset
+    @@tt=TotalTime.new
+  end
   def data
     case @type
     when :raw
       rawdata(@value)
     when :mark
       "# marktrack(#{@track}_#{@mark}) [#{@value}]\n"
-    when :c,:o,:off
+    when :comment,:on,:off
       @value
     else
       varlenHex(@time)+@value
     end
   end
+  def display
+    "#{@pos}(#{@time}) #{@type} => #{@value}"
+  end
 end
+
 # arg=[steps],[values]
 def mymerge span,*arg
   r=[]
@@ -690,7 +769,8 @@ module MidiHex
     @bendrange=2
     @bendCent=1
     @pancenter=64
-    @prepareSet=[@tbase,@ch,@velocity,@velocityFuzzy,@basekey,@gateRate,@bendrange,@bendCent]
+    @scalenotes=ScaleNotes.new
+    @prepareSet=[@tbase,@ch,@velocity,@velocityFuzzy,@basekey,@gateRate,@bendrange,@bendCent,@scalenotes]
     @chmax=15
     @bendrangemax=127
     file="midi-programChange-list.txt"
@@ -755,7 +835,7 @@ module MidiHex
     @bendCent=8192/@bendrange/100.0 if on
   end
   def self.trackPrepare tc=0
-    @tbase,@ch,@velocity,@velocityFuzzy,@basekey,@gateRate,@bendrange,@bendCent=@prepareSet
+    @tbase,@ch,@velocity,@velocityFuzzy,@basekey,@gateRate,@bendrange,@bendCent,@scalenotes=@prepareSet
     @strokespeed=0
     @preGate=[]
     @preVelocity=[]
@@ -768,6 +848,7 @@ module MidiHex
     tc=@chmax if tc>@chmax
     @panoftrack=panbytrack(tc)
     @ch=tc
+    Event.new(:dummy).reset
   end
   def self.header format,track,tbase=@tbase
     format=[format,0xff].min
@@ -808,7 +889,7 @@ module MidiHex
     start=@waitingtime
     @waitingtime=0
     @nowtime+=start
-    r=[Event.new(:o)]
+    r=[Event.new(:on)]
     r<<Event.new(:e,start," 9#{ch} #{key} #{vel} # #{start}後, sound on only , note #{@key} velocity #{velocity}\n")
     r
   end
@@ -874,6 +955,10 @@ module MidiHex
   def self.dummyNote key,len,accent=false,sharp=0
     vel=@velocity
     vel+=@accentPlus
+    if key=="?"
+      key=rand(0x7f)
+      key=self.note2key(@scalenotes.sample) if @scalenotes.size>0
+    end
     key=@preNote.shift if @preNote.size>0
     len=@preLength.shift if @preLength.size>0
     self.oneNote(len,key,vel,sharp)
@@ -1299,6 +1384,12 @@ module MidiHex
     @chordCenter=[[0,@chordCenter].max,0x7f].min
     @firstchordbase=@chordCenter
   end
+  def self.scale s
+    s=s.split(",")
+    s.each{|i|
+      @scalenotes<<i
+    }
+  end
   def self.preLength v
     @preLength=v.map{|i|
       case i
@@ -1391,11 +1482,12 @@ module MidiHex
     Event.new(:mark,m,@tracknum,@nowtime)
   end
   def self.eventlist2str elist
-    r=[]
+    @eventlist=[]
+    r=@eventlist
     # EventList : [func,args]  or [callonly, func,args] or others
     elist.each{|h|
       cmd,*arg=h
-      r<<Event.new(:c,"# #{cmd} #{arg}")
+      r<<Event.new(:comment,"# #{cmd} #{arg}")
       case cmd
       when :basekeyPlus
         @basekey+=arg[0]
@@ -1434,6 +1526,7 @@ module MidiHex
       if i.class==String
         rr<<i
       else
+          # Event class
           case i.type
           when :ahead
               ahead=i.time
@@ -1442,16 +1535,16 @@ module MidiHex
               n-=1 until (rr[n].time>0) || n<-10
               if n>-10
                 ahead=[ahead,-rr[n].time].max
-                rr[n].time+=ahead
+                rr[n].addtime(ahead)
                 after=-ahead
               else
                 after=0
               end
             when :end,:e,:sys
-              (i.time+=after;after=0) if after>0
-              (i.time+=after;after=0) if after<0 && i.time+after>=0
+              (i.addtime(after);after=0) if after>0
+              (i.addtime(after);after=0) if after<0 && i.time+after>=0
               rr<<i
-            when :c,:raw,:mark
+            when :comment,:raw,:mark
               rr<<i
             else
               "? #{i}"
@@ -1483,7 +1576,7 @@ module MidiHex
     @h<<[:controlChange,"10,#{@panoftrack}"] if @autopan
     cmd=rundata.scan(/&\([^)]+\)|\([-+]*[[:digit:]]?\)|:[^\(,]+\([^\)\(]+\),|:[^,]+,|\([^:]*:[^)\(]*\)|_[^!_]+!|_[^_]__[^\?]+\?|v[[:digit:]]+|[<>][[:digit:]]*|\*?[[:digit:]]+\.[[:digit:]]+|\*?[[:digit:]]+|[-+[:alpha:]]|\^|`|'|./)
     cmd<<" " # dummy
-    p "make start: ",cmd if $DEBUG
+    p "track hex; start making: ",cmd if $DEBUG
     cmd.each{|i|
       if wait.size>0
         t=@tbase
@@ -1657,6 +1750,8 @@ module MidiHex
         @h<<[:soundOn,i]
       when /^\(off:(.*)\)/
         @h<<[:soundOff,$1]
+      when /^\(scale:(.*)\)/
+        @h<<[:call,:scale,$1]
       when /^\(chordcenter:(.*)\)/
         @h<<[:call,:chordCenter,$1]
       when /^\(stroke:(.*)\)/
@@ -1722,7 +1817,7 @@ module MidiHex
         wait<<[:dummyNote,i]
       when " "
       when "?"
-        wait<<[:rawsound,rand(0x7f)]
+        wait<<[:dummyNote,"?"]
       else
         if @notes.keys.member?(i)
           wait<<[:sound,i]
@@ -1734,6 +1829,7 @@ module MidiHex
     p @h if $DEBUG
     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"
   end
   def self.loadMap file, base=0
@@ -1840,6 +1936,7 @@ module MidiHex
       @snare=self.percussionGet("snare")
     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
     @marksh||=@marktrack.calc
     data=data.split("\n").map{|i|

data/lib/smml/version.rb

@@ -1,3 +1,3 @@
 class Smml
-  VERSION = "0.1.0.1"
+  VERSION = "0.1.0.4"
 end

metadata

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