smml 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06bb5368c7eb0544ede87c56f49c7808730e974d
-  data.tar.gz: 35e8347b78ef6bc939822f70df30c3c6f9980fc8
+  metadata.gz: 7e98825702f8770b16248f090e7dca0a3890eb91
+  data.tar.gz: d2b6e346dbd790585f5534e8f626e1635bac8cbb
 SHA512:
-  metadata.gz: a266b303a40de9ce2a99da0cfaeb25ee24f03d09c3426050b09e14455d879ea8568924a3c42242d7c72808ee5495aabf37caa7af2a4c9d3934383d6582d11054
-  data.tar.gz: 00c2c5d0aaa44000728c44222c1f070a054957af00699898b2c9d11816f349acf3a879b7572fa8daaec012e8afa8b6d0bddb012ec55b6514b88172d4cc512090
+  metadata.gz: 65904b8614d1f1df18564cfa439f54219a8dfb1518709582d42a3a06fcf58bc60566fd162b6a92bf26ca48cbf9c665b179ea1193001442ff54faf2b28d9cf52d
+  data.tar.gz: 43fd189cf0d48058b21d802b4f62b55eb293b4fbe33e669c907f3197b434e79aaa2fec21b50f6a1c3356965fc85db1db664da71e0bc002339fc66914de1b423b

data/lib/smml/msm.rb

@@ -117,6 +117,8 @@ syntax: ...( will be changed time after time)
       '{d,g,-b}' => multi note
       ':cmaj7,'  => chord name
     and other commands are with parentheses.
+
+    for more details, see tutorial_smml.md
 EOF
 end
 def hint
@@ -289,10 +291,10 @@ module MmlReg
     self.r(key,sort,pre)
   end
   def self.trackr
-    self.r([:hexraw,:sharp,:chord,:sword,:word,:sound,:tieNote,:register,:modifier,:velocity,:tempo,:num,:octave,:note2,:note,:mod,:note?,:sound?])
+    self.r([:hexraw,:sharp,:chord,:chword,:word,:sound,:tieNote,:register,:modifier,:velocity,:tempo,:num,:octave,:note2,:note,:mod,:note?,:sound?])
   end
   def self.multipletr
-    self.r([:note2,:sword,:word,:note,:sound,:tieNote,:register,:chord,:numswing,:num,:sharp,:octave,:mod])
+    self.r([:note2,:chword,:word,:note,:sound,:tieNote,:register,:chord,:numswing,:num,:sharp,:octave,:mod])
   end
   def self.macroDefr
     self::MacroDef
@@ -319,7 +321,7 @@ module MmlReg
     :repStart,
     :repEnd,
     :note2,
-    :sword,
+    :chword,
     :word,
     :modifier,
     :sharp,
@@ -356,7 +358,8 @@ module MmlReg
   @@h[:repmark]="\\.FINE|\\.DS|\\.DC|\\.\\$|\\.toCODA|\\.CODA|\\.SKIP"
   @@h[:comment]="\\( *comment[^\(\)]*\\)"
   @@h[:note2]="\\( *tne *:[^\(\)]*\\)|\\( *[[:alpha:]\\-\\+]+,[^,]*\\)"
-  @@h[:sword]="\\([^\(\):,]*:[^\(\),]+\\([^\(\)]+\\)\\)"
+  # parenthesis arg, chord inside etc.
+  @@h[:chword]="\\([^\(\):,]*:[^\(\),]+\\([^\(\)]+\\)\\)"
   @@h[:word]="\\([^\(\):,]*:[^\(\)]*\\)"
   @@h[:wordStart]="\\([^\(\):]*:"
   @@h[:sharp]="\\([+-]*[[:digit:]\\.]*\\)"
@@ -597,6 +600,7 @@ class Chord
 end
 class Notes < Hash
   @@rythmChannel=9
+  @@defaultbase="c"
   @@notes={
     "c"=>0,
     "C"=>1,
@@ -621,7 +625,19 @@ class Notes < Hash
   def initialize
     @@notes.each{|k,v|self[k]=v}
   end
-  def self.n2note num
+  def self.offset a,b="c"
+    r=@@notes[a]-@@notes[b]
+    if r>6
+      r-=12
+    elsif r<-6
+      r+=12
+    else
+    end
+    r
+  end
+  def self.n2note num,base="c"
+    offset=self.offset(base,@@defaultbase)
+    num+=offset
     @@invert[num%@@octave]
   end
   def self.n2octave num
@@ -647,6 +663,102 @@ class Notes < Hash
     pre+@@invert[num%@@octave]
   end
 end
+class Tonality
+  def initialize key="c"
+    @scalenotesize=7
+    @naturalscale=[*"a".."g"]
+    @sharp=[:f,:c,:g,:d,:a,:e,:b]
+    @flat=@sharp.reverse
+    @arabic=[0,1,4,5,7,8,10]
+    @cycle=[:c,:f,:A,:D,:G,:C,:F,:b,:e,:a,:d,:g,:c]
+    @cf={}
+    @cs={}
+    @bymarkcount={}
+    @sfnow={}
+    7.times{|n|
+      i=@cycle[n]
+      @cycle.index(i).times{|s|
+        @cf[i]=[] if ! @cf[i]
+        @cf[i]<<@flat[s]
+      }
+    }
+    7.times{|n|
+      i=@cycle.reverse[n]
+      @cycle.reverse.index(i).times{|s|
+        @cs[i]=[] if ! @cs[i]
+        @cs[i]<<@sharp[s]
+      }
+    }
+    7.times{|i|@bymarkcount[i]=@cycle.reverse[i]}
+    7.times{|i|@bymarkcount[-i]=@cycle[i]}
+    self.set(key)
+  end
+  def sharp t
+    @cs[t.to_sym]
+  end
+  def flat t
+    @cf[t.to_sym]
+  end
+  def setBySharp t,scale
+    return if scale.size>@scalenotesize
+    sc=scale.map{|i|Notes.n2note(i,t)}
+    offset=Notes.offset(t)
+    @naturalscale=@naturalscale.rotate while @naturalscale[0]!=t.downcase
+    r=[]
+    @scalenotesize.times{|i|
+      a=Notes.offset(sc[i],@naturalscale[i])
+      @sfnow[@naturalscale[i].to_sym]=a if a!=0
+      r<<a
+    }
+    r
+  end
+  def setArabic base
+    setBySharp(base,@arabic)
+  end
+  def tonalitycheck t,sfnote=false
+    t=@bymarkcount[t.to_i] if t=~/^[-+[:digit:]]/
+    if t=~/m$/
+      # use relative major tonality data
+      t=$`.to_sym
+      t=@cycle[(@cycle.index(t)+3)%12]
+    end
+    t=t.to_sym
+    cf=sfnote ? (@cf[t]||[]) : (@cf[t]||[]).size
+    cs=sfnote ? (@cs[t]||[]) : (@cs[t]||[]).size
+    case @cycle.index(t)
+    when 0...7
+      [:flat,cf]
+    else
+      [:sharp,cs]
+    end
+  end
+  def set t
+    @key=t
+    @sfnow={}
+    if t=~/ *arabic/
+      setArabic($`)
+    elsif t=~/,/
+      base,*sc=t.split(',')
+      sc=sc.map{|i|i.to_i}
+      setBySharp(base,sc)
+    else
+      r=tonalitycheck(t,true)
+      r[1].each{|i|@sfnow[i]=r[0]}
+    end
+  end
+  def getSharp n
+    n=n.to_sym
+    case @sfnow[n]
+    when -2..2  then @sfnow[n]
+    when :sharp then  1
+    when :flat  then -1
+    else              0
+    end
+  end
+  def dump
+    [:now_cf_cs,[@sfnow,@cf,@cs].map{|i|i.map{|k,v|"#{k} #{v.class==Array ? v.sort : v}"}}]
+  end
+end
 class ScaleNotes < Array
   def setSampleRate c
     @samplerate=c
@@ -1244,6 +1356,7 @@ module MidiHex
   # initialize
   def self.prepare bpm=120,tbase=480,vel=0x40,oct=:near,vfuzzy=2,strict=false
     @ready=true
+    @tonality=Tonality.new("c")
     @bendHalfMax=BendHalf
     @strictmode=strict
     @autopan= strict ? false : true
@@ -1299,11 +1412,11 @@ module MidiHex
   end
   def self.setDefault
     @prepareSet=[
-      @tbase,@ch,@velocity,@expression,@velocityFuzzy,@basekey,@gateRate,@bendCentOn,@bendrange,@bendCent,@bendNow,@scalenotes,@gtune,@expressionRest,@expressionDef,@registerHash,@swingHash
+      @tbase,@ch,@velocity,@expression,@velocityFuzzy,@basekey,@gateRate,@bendCentOn,@bendrange,@bendCent,@bendNow,@scalenotes,@gtune,@expressionRest,@expressionDef,@registerHash,@swingHash,@tonality
     ]
   end
   def self.getDefault
-      @tbase,@ch,@velocity,@expression,@velocityFuzzy,@basekey,@gateRate,@bendCentOn,@bendrange,@bendCent,@bendNow,@scalenotes,@gtune,@expressionRest,@expressionDef,@registerHash,@swingHash=
+      @tbase,@ch,@velocity,@expression,@velocityFuzzy,@basekey,@gateRate,@bendCentOn,@bendrange,@bendCent,@bendNow,@scalenotes,@gtune,@expressionRest,@expressionDef,@registerHash,@swingHash,@tonality=
       @prepareSet
   end
   def self.dumpstatus
@@ -1312,6 +1425,9 @@ module MidiHex
       p [i, val] if "#{val}".size<100
     }
   end
+  def self.setTonality n
+    @tonality.set(n)
+  end
   def self.setmidiname name
     @midiname=name
   end
@@ -1453,6 +1569,15 @@ module MidiHex
     l,r=len,0 if len<lenforgate
     [l,r]
   end
+  def self.notesharp note,sharp
+    s=0
+    if sharp!=0
+      s=sharp
+    else
+      s=@tonality.getSharp(note)
+    end
+    s
+  end
   def self.soundOn key=@basekey,velocity=@velocity,ch=@ch,sharp=0
     key=self.note2key(key) if key.class==String
     key,ch=key if key.class==Array
@@ -1611,6 +1736,7 @@ module MidiHex
   end
   def self.noteCalc c,last,base
     n=@notes[c]
+    n+=self.notesharp(c,0)
     if @octmode==:near && n.class != Array
       if last
         n+=12 if last-n>6
@@ -2026,7 +2152,7 @@ module MidiHex
     k=if tone=~/^_/
         [self.percussionGet(tone),@rythmChannel]
       elsif @notes.keys.member?(i)
-        @basekey+oct*12+@notes[i]
+        @basekey+oct*12+@notes[i]+self.notesharp(i,0)
       else
         i.to_i
       end
@@ -2077,9 +2203,8 @@ module MidiHex
     @chordCenter=[[0,@chordCenter].max,0x7f].min
     @firstchordbase=@chordCenter
   end
-  # todo: use scale name
   def self.scale s
-    s=s.split(",")
+    s=s.scan(/[^,]-[^-,]+|[-+]+[[:digit:]]+|[^()]*\([^()]+\)|[^,]+|,/)-[","]
     first=s.first
     mode=s[1]
     if s.size==1
@@ -2087,18 +2212,19 @@ module MidiHex
       when /^[-+]/
         shift=first.to_i
         @scalenotes=@scalenotes.move(shift)
+      when /^(.)-([^-]+)$/
+        f,mode=$1,$2
+        @scalenotes.reset
+        @scalenotes.setmode(f,:"#{mode}")
       when /^:?(.)(.*)/
         @scalenotes.reset
         base=$1
         ten=Chord.type($2)
         ten.each{|i|
-          note=Notes.get(base,i) # if i=~/^[-+]+[[:digit:]]+$/
+          note=Notes.get(base,i)
           @scalenotes<<note
         }
       end
-    elsif @scalenotes.keys.member?(:"#{mode}")
-      @scalenotes.reset
-      @scalenotes.setmode(first,:"#{mode}")
     else
       @scalenotes.reset
       s.each{|i|
@@ -2365,8 +2491,8 @@ module MidiHex
     vars=self.instance_variables.map{|i|i.to_s[1..-1]}.sort
     s=v.split(',')
     s.each{|v|
-      v=~/\A[[:alnum:]]+\z/
-      if $& && vars.member?(v)
+      v=~/\A([[:alnum:]]+)[[:alnum:].]*\z/
+      if $& && vars.member?($1)
         puts "@#{v} #{eval("@#{v}")}"
       elsif v=="?"
         puts vars*", "
@@ -2649,6 +2775,8 @@ module MidiHex
       when MmlReg.rr([:register])
         i=~/[[:digit:]]+/
         @h<<[:call,:register,$&]
+      when /^\(tonality:(.*)\)/
+        @h<<[:call,:setTonality,$1]
       when /^\(set":(.*)\)/
         d=$1.split(",")
         @h<<[:call,:setRegister,*d]
@@ -3303,8 +3431,11 @@ def repCalc line,macro,tbase
       pointDS=countertmp
     when ";"
       current=""
-    when /^\(([^\)]+):$/
-      lastcmd=$1 if $1 != "C"
+    when /^\((\^)?([^\)]+):$/
+      mark,cmd=$1,$2
+      # (reUsedCmd:arg)  (^onceOnlyCmd:arg)
+      lastcmd=cmd if ! mark && cmd != "C"
+      current="(#{cmd}:"
     when "(:"
       current="(#{lastcmd}:"
     else

data/lib/smml/version.rb

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

data/tutorial_smml.md

@@ -193,7 +193,7 @@ direct tention order by pre ':' with a half note distance number from chord base
 ```
 
 in chord name, generally numbers don't mean chromatic distance. don't confuse.
-easy way of counting distance number in chord is to count only white key ignoring black on a piano.
+when key is c major etc., scale not using sharps/flats , easy way of counting distance number in the chord is to count only white key ignoring black on a piano.
 +5 means a sharp of 5th. if there is perfect 5th in the chord, 5th note will be deleted by '(+5)' because they don't appear together generally.
 when you want to use abnormal tentions like conbination of these, direct order can be used like 'c7(:8)' on your own risk.
 :8 expresses a note sharp of 5th by a half note expression. count all of the white and black key between c and g sharp on a piano.
@@ -218,6 +218,11 @@ list of chromatic scale expression is here, (when base note is 'c')
  :12 c (next octave)
 ```
 
+as an useless example, the chord using all 12 notes of an octave is 'c(:0,:1,:2,:3,:4,:5,:6,:7,:8,:9,:10,:11)'
+
+normally important tention notes are used in high positions, but now it is not considered in chord transpose calculating.
+all notes are considered as even importances.
+
 
 ## tempo
 ;; most commands except note type ones, are inside parenthesis. set the tempo 120 bpm.
@@ -287,6 +292,7 @@ this multi-tone passage is repeated four times. ```:0``` is 'c' and ```:1``` is
 _snare! = = =
 ```
 
+
 ;; set instrument. automaticaly searched by even not exact name. (MIDI program change command)
 it depend on map files.
 
@@ -583,8 +589,30 @@ in the same way,
 is same mean to above. 'o' is dummy note. note hights are substituted by '(N:..)' values.
 
 
+## scale
+
+scale values are used for random notes only now.
+
+
+definition:
+
+```
+ (scale:a,b,c,d,e)             ;; series of note names
+ (scale:d-dorian)              ;; starting note and mode name. this will be '(scale:d,e,f,g,a,b,c)'
+ (scale:a,+2,+3,+5,+7,+9,+11)  ;; first note and plus values to add to first note
+ (scale:+5)                    ;; shift all values from preceding scale. after above scale, this will be '(scale:d, ...)'.
+ (scale:g7)                    ;; by chord name
+ (scale:)                      ;; reset scale value
+```
+
+shift value is by a half tone.
+when arg size of a scale command is one, it is manipulated as a chord name, mode name, or relative shift value.
+still incompleted to use.
+
 ## dummy note
 'o' is dummy. '?' is for random note etc.
+if a scale has been defined as above, random notes will be selected from its scale notes.
+
 
 ```
  ? /2: ???? /
@@ -603,26 +631,36 @@ or maybe
 ```
 
 etc.
-if a scale has been defined as below, random notes will be selected from its scale notes.
+
+
+another random note.
 
 ```
- (scale:a,b,c,d,e)             ;; series of note names
- (scale:a,+2,+3,+5,+7,+9,+11)  ;; first note and plus values to add to first note
- (scale:+5)                    ;; shift all values from preceding scale. after above scale, this will be '(scale:d, ...)'.
- (scale: :g7, )                ;; by chord name
+ [ (?: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.
 ```
 
-shift value etc. is by a half tone.
-still incompleted to use.
+## tonality
+
+```
+ (tonality:d)
+ (tonality:+2)
+```
 
+set tonality 'd', d major. 'dm' as d minor.
+after above, 'defgabcd' will become 'deFgabCd' automaticaly by two sharps, so '+2' can be used as an argument.
+still under construction.
 
-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.
+ (tonality:D)efgabcde
 ```
 
+in above, the tonality is 'D' major, e flat major, so following e, a, and b are flat notes.
+feel strange a little bit? i think so too.
+
+
+
 ## transpose
 
 ```
@@ -951,19 +989,46 @@ but now blanks are removed. someday maybe fixed ?
   (dumpVar: varName)
 ```
 
-directly set local MidiHex variable, dump while compiling if the varName and value are valid.
+directly set local MidiHex variable, dump while compiling if the varName (with noe method) and value are valid.
+
 
 # syntax implement policy: 
 
 
 parenthesis command is buil with (name:value,value,...). names often used are shorter, or leave it as it is as possible.
 
-
-sound is modifier + note + length word.
-
+sound is modifier + note + length word. modifiers are effective for one note only against premodifier etc.,  parenthesis commands, are for permanent effects. 
 
 let it not too complicated in sound part for visibility.
 especially, for other words not to hide note type words.
 
-
 many values in MIDI are 0-127, so values are integers except pre -/+ values that mean differences.
+
+a priority matter is how to catch up with sound which come to mind and to write down it quickly.
+
+
+# prologue
+
+one of my neibourhood, who cann't play or write music, said that oh i remember this piano piece i had listened once only you played last time, i am great, great, great?
+people can remind or make sounds in their mind easily but it is difficult to write it down except trained.
+i play the piano and other instruments, but it took another long time to learn writing down music.
+
+
+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.
+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
+
+
+but i feel that it is too ... too much difficult to read general MMLs and understand and remind sounds ... sometimes.
+what can we do? forget music? become a machine? change MML? change the world?
+

metadata

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