smml 0.1.0 → 0.1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8aa416af4560085821e2b1a7ed3e57434639602
-  data.tar.gz: cb0b869acdc8c4b173cbab84b99487e41bd3cf92
+  metadata.gz: 030ec4626cbd1d8bbd61fe4e13b993ec2c27cfd6
+  data.tar.gz: f4a8aea294b67884dad7449c5ba524db6b162e76
 SHA512:
-  metadata.gz: 82b264a3f12b49a27049d9eee0f43ce72a0d510ba61a95ee4fc00185c8e4279a37c876594358e6e47cc57c96d779f6ad18de0d9de5c7083c4262cc99dcb3b705
-  data.tar.gz: 496db22b2ff32c0ade3dc275cc93362b1ff6e4f35f28e04e910a8d4d8d716320266b5fa3038fe297d7baefc6262eff6f5013ad6625d777874c0f0c783cf592ba
+  metadata.gz: c91c1d55a355e8bd9a35999df025fdbe95f1f1532e72e5f94fac6e6b9b0256a43543cf60383bf7865e5a3f692a2e3fccb3a27a2570449a32b5f5ba891936a0b3
+  data.tar.gz: fe30d0f2596410987755d5fadb450340ae7070c820e5de1b548054967b0ce7f30b680c425dad433a3f07445cc5edfcd2aaabd8011be45aa7bf00e023b897dbf5

data/README_smml.md

@@ -23,9 +23,16 @@ Or install it yourself as:
 
 ## Usage
 
-    m=MmlTracks.new
+in a ruby script,
+
+    m=Smml.new
     m.compile('infile.mml','outfile.mid')
 
+Or exec command
+
+    $ smml -i infile.mml -o outfile.mid
+    $ smml -d "cdefgab"  -o outfile.mid
+
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/smml/fork )

data/bin/mmlsmml

@@ -0,0 +1,61 @@
+#!/usr/bin/ruby
+# -*- encoding: utf-8 -*-
+
+begin
+  require'./lib/smml/msm'
+rescue LoadError
+  require'smml'
+end
+
+def help
+  puts Smml::VERSION
+  puts %Q(
+  ARGS:
+    -i infile.mml -o outfile.mid 
+  or
+    -d "MML data" -o outfile.mid
+  for dump smml
+    -s
+
+  syntax:
+    A: a2bc dref => track A, MML data
+    B: c2de frga => track B, MML data
+
+    #  comment
+    +- sharp,flat
+    []3 repeat 3 times
+  )
+end
+
+infile="infile.mml"
+outfile="mml.mid"
+data=""
+
+opt = OptionParser.new
+opt.on('-i file',"input file") {|v| infile=v }
+opt.on('-o file',"output file") {|v| outfile=v }
+opt.on('-s',"dump smml data") {|v| $smmlshow=v }
+opt.on('-d d',"input data string") {|v| data=v }
+opt.on('-h',"help") {|v|
+  help
+}
+opt.parse!(ARGV)
+
+def p *v
+  super v if $DEBUG
+end
+
+
+m=Smml.new
+puts
+data=data.size>0 ? data.split(';')*"\n" : (File.read(infile) rescue (help;exit))
+p data
+data=data.split("\n").map{|i|i.commentoff("\n",'#')}*"\n"
+p data
+smml=Mml.tosmml(data)
+puts smml if $smmlshow || $DEBUG
+m.octave=:far
+m.data=smml
+m.outfile=outfile
+m.make
+m.save

data/bin/smml

@@ -8,7 +8,6 @@ begin
   require'./lib/smml/msm'
 rescue LoadError
   require'smml'
-  p Smml::VERSION
 end
 
 infile=false
@@ -56,14 +55,14 @@ opt.on('-m i',"mode of test/ 1:GM 2:XG 3:GS") {|v| $testmode=v.to_i }
 opt.on('-n',"test only (dont write outfile)") {|v| $testonly=true }
 opt.parse!(ARGV)
 
-mtr=MmlTracks.new(tbase,pspl,expfile,cmark)
-mtr.infile=infile
-mtr.outfile=outfile
-mtr.data=data
-mtr.velocity=velocity
-mtr.bpm=bpm
-mtr.octave=octaveMode
-mtr.vfuzzy=vfuzzy
-mtr.autopan=autopan
-mtr.make($test,$fuzzy)
-mtr.save if not $testonly
+m=Smml.new(tbase,pspl,expfile,cmark)
+m.infile=infile
+m.outfile=outfile
+m.data=data
+m.velocity=velocity
+m.bpm=bpm
+m.octave=octaveMode
+m.vfuzzy=vfuzzy
+m.autopan=autopan
+m.make($test,$fuzzy)
+m.save if not $testonly

data/bin/ssmml

@@ -8,7 +8,6 @@ begin
   require'./lib/smml/msm'
 rescue LoadError
   require'smml'
-  p Smml::VERSION
 end
 
 infile="infile.mml"
@@ -21,5 +20,5 @@ opt.on('-o file',"output file") {|v| outfile=v }
 opt.on('-d d',"input data string") {|v| data=v }
 opt.parse!(ARGV)
 
-mtr=MmlTracks.new
-mtr.compile(infile,outfile,data)
+m=Smml.new
+m.compile(infile,outfile,data)

data/lib/smml/msm.rb

@@ -7,6 +7,7 @@ $debuglevel=0
 
 def hint
   cmd=File.basename($0)
+  puts "Smml v#{Smml::VERSION}"
   puts <<EOF
 usage: #{cmd} -d \"dddd dr3 dddd r4 drdrdrdr dddd dr3\" -o outfile.mid -t bpm
        #{cmd} -i infile.txt  -o outfile.mid -t bpm
@@ -2198,7 +2199,7 @@ def modifierComp t,macro
   }*""
 end
 
-class MmlTracks
+class Smml
   attr_accessor :tracknum, :tbase, :rundatas, :rawdatas, :mx
   attr_accessor :bpm, :velocity, :octave, :vfuzzy, :data, :infile, :outfile, :autopan
   def initialize tbase=480,pagesep='///',expfile=false,cmark=';;'
@@ -2334,3 +2335,104 @@ class MmlTracks
     save
   end
 end
+
+module Mml
+def self.calclen len,digdef,last
+  if last == :sound
+    htn=0
+    if len=~/\.+/
+      len=$`.to_i
+      len=digdef if len==0
+      htn=$&.size
+    end
+    len=4.0/len.to_i
+    baselen=len/2.0
+    htn.times{len+=baselen;baselen/=2.0}
+    len=len.round if len==len.round
+    len="" if len==1
+  end
+  len
+end
+def self.tosmml data
+  tracks={}
+  tr=0
+  last=:no
+  lines=data.split("\n")
+  lines.each{|mml|
+    octave=3
+    digdef=4
+    mml.scan(/([[:alpha:]]):|([[:alpha:]<>])([#\+\-])?([[:digit:]\.]+)?|@([[:alpha:]]+|[[:digit:]]+)|([[:digit:]\.]+)|([\[\]])| |/).each{|tname,al,sharp,dig,sname,dig2,same|
+      valueAr=[tname,al,sharp,dig,sname,dig2,same]
+      value=valueAr*""
+      (tr=tname;next) if tname
+      len=dig|| digdef
+      len=calclen(len,digdef,:sound)
+      dig2=calclen(dig2,digdef,last) if dig2
+      last=:no
+      v=""
+      case al ? al.upcase : al
+      when ">"
+        octave+=1
+        v="+"
+        p "oct= #{octave} : #{v}"
+      when "<"
+        octave-=1
+        v="-"
+        p "oct= #{octave} : #{v}"
+      when "L"
+        digdef=dig
+        p "defaault length : #{dig}"
+      when "O"
+        v="(oct:#{dig})"
+        p "octave #{dig} : #{v}"
+      when "Q"
+        v="(gate:#{dig})"
+        p "gate #{dig} : #{v}"
+      when "P"
+        v="(pan:#{dig})"
+        p "pan #{dig} : #{v}"
+      when "N"
+        v="{#{dig}}"
+        p "note #{dig}  : #{v}"
+      when "T"
+        v="(tempo:#{dig})"
+        p "tempo #{dig} : #{v}"
+      when "V"
+        v="(v:#{dig})"
+        p "velocity #{dig} : #{v}"
+      when "R"
+        v="r#{len}"
+        p "rest  #{len} : #{v}"
+        last=:sound
+      when nil
+        if sname
+          v="(p:#{sname})"
+          p "sound name #{sname} : #{v}"
+        elsif same
+          v=same
+          p "same : #{v}"
+        end
+      when "A".."G"
+        note=al.downcase
+        case sharp
+        when "#","+"
+          note=note.upcase
+        when "-"
+          note="(-)"+note
+        end
+        v="#{note}#{len}"
+        p "note #{al} #{sharp}  #{len} : #{v}"
+        last=:sound
+      end
+      v="#{dig2}" if dig2
+      STDERR.puts "[#{value}] undefined?" if v=="" && value.size>0
+      if tracks[tr]
+        tracks[tr]<<v
+      else
+        tracks[tr]=v
+      end
+    }
+  }
+  tracks.keys.sort.map{|k|tracks[k]}*"\n|||\n"
+end
+end

data/lib/smml/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smml
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.0.1
 platform: ruby
 authors:
 - tabasano
@@ -42,6 +42,7 @@ description: compile a Music Macro Language file to a Standard MIDI file.
 email:
 - pianotoieba+smml@gmail.com
 executables:
+- mmlsmml
 - smml
 - ssmml
 extensions: []
@@ -54,6 +55,7 @@ files:
 - lib/smml/midi-programChange-list.txt
 - lib/smml/msm.rb
 - lib/smml/version.rb
+- bin/mmlsmml
 - bin/smml
 - bin/ssmml
 - Gemfile